fly/A320-family
1
0
Fork 0
Code Activity
2407 commits 7 branches 0 tags 704 MiB
Commit graph

1338 commits

Author SHA1 Message Date
legoboyvdlp R
327faf9b8d Effects / animations of engine fairing objects moved to engine XML files 2021-07-01 15:33:10 +01:00
semir
479c79028d MODEL:CEO engine fairings moved from main model to respective engine models due to NEO 2021-06-30 12:31:53 +02:00
semir
3ac9f67ea3 MODEL: Fixed PW1100G floating object when reversing, materials removed from inner objects 2021-06-28 17:57:40 +02:00
legoboyvdlp R
d837d0cc9a Fix typo 2021-06-28 13:29:46 +01:00
legoboyvdlp R
0b85e3867e Cleanup post merge; add XML 2021-06-28 13:25:06 +01:00
legoboyvdlp R
e028870b51 Merge branch 'dev' into 3D 2021-06-28 13:04:37 +01:00
semir
da765d8a93 MODEL: Fixed R/H PW1100G magically displaced along the Z axis! 2021-06-27 00:54:31 +02:00
semir
792b7dee55 MODEL/TEXTURE:Initial PW1100G(PWPP) commit with base texture and normal map. No XML 2021-06-27 00:48:12 +02:00
legoboyvdlp R
611cd9c74c More stuff 2021-06-21 17:52:13 +01:00
legoboyvdlp R
01018ef743 Rework the system display handler to properly handle failures and manual calling of pages 2021-06-21 16:38:22 +01:00
Inuyaksa
1878bcd02a ND: TCAS range ring 2.5 mn 2021-06-19 23:36:49 +02:00
Josh Davidson
988d674071 VC: Fix display shader problem due to missing file sorry 2021-06-19 11:44:16 -04:00
legoboyvdlp R
425083482f Merge branch 'dev' into 3D 2021-06-19 15:14:18 +01:00
legoboyvdlp R
4297101ec9 PFD indication of vertical speed 2021-06-18 17:01:50 +01:00
legoboyvdlp R
ac0db37a26 TERR ON ND switch - change label to green 2021-06-16 15:30:54 +01:00
legoboyvdlp R
e3502622ce Merge branch 'dev' into 3D 2021-06-16 15:04:46 +01:00
legoboyvdlp R
768cf4e1a0 FCU: improve display of characters; LVL / CH should always display also. Improve speed control range 2021-06-16 13:36:36 +01:00
legoboyvdlp R
84526a7dfe FCU: vs / fpa -- improve display 2021-06-16 12:39:59 +01:00
legoboyvdlp R
cebc7584e9 Actually remove; don't just comment out 2021-06-13 18:58:35 +01:00
Inuyaksa
5715d480b7 A better autoland light - first attempt 2021-06-12 21:46:44 +02:00
Inuyaksa
c4036fc407 autoland light, phase as a nodes optimzed fmgc phase loop 2021-06-12 15:42:41 +02:00
legoboyvdlp R
1827042f10 Merge branch 'dev' into 3D 2021-06-09 17:33:32 +01:00
legoboyvdlp R
aa3990d3d9 Misc fixes + improvements to Nasal code; no real changes; only improved code quality 2021-06-08 18:16:19 +01:00
legoboyvdlp R
0dd4f55400 Correct acconfig.nas failures resetting; brake guague --> use lag_filter instead of property rules filter 2021-06-08 16:53:09 +01:00
legoboyvdlp R
9798a20850 Hydraulics / brakes: smooth the pressure guague 2021-06-07 15:38:50 +01:00
Josh Davidson
0515ff4f66 VC: Display shader overhaul 2021-06-06 12:45:04 -04:00
Josh Davidson
fa1ace4da3 Files: Merge dev 2021-06-06 11:18:50 -04:00
semir
53ad962e5f TEXTURE:LEAP normal map slightly improved 2021-06-01 20:09:19 +02:00
semir
630644ae7d MODEL:Changed some bad naming for reverser door along with corresponding xml. Added missing inner objects to animations and effects 2021-05-31 10:39:15 +02:00
semir
51a4310058 Fix for effects not applier to L/H LEAP revereser 2021-05-30 23:25:14 +02:00
Lars Toenning
9b3142cb64 FCU: Change HDG and ALT display formatting 
Show select HDG always with 3 digits (if select HDG < 100 with leading 0)

Show selected ALT always with 5 digits.
 2021-05-30 21:45:12 +02:00
semir
6588a965b8 Displaythe LEAP normal map on the model 2021-05-30 21:06:52 +02:00
semir
57817a4c3c TEXTUR: Normal map for LEAP 2021-05-30 19:48:39 +02:00
Josh Davidson
8398d2b04d DU: Fix bad display of EPR 2021-05-27 15:15:06 -04:00
Josh Davidson
a1077d6caf DU: Fix N1 mode REV 2021-05-27 12:03:52 -04:00
semir
03af938829 QTR livery: Fix for rudder texture bleeding onto hstab leading edge 2021-05-22 18:14:57 +02:00
legoboyvdlp R
439a7c7b50 Terrain display: only show sea level water as cyan 2021-05-22 13:18:21 +01:00
semir
2a19651e2e MODEL:Temporary fix for display size irregularities until flightdeck v2 comes 2021-05-19 20:22:37 +02:00
Josh Davidson
d5b0099aec Merge branch 'dev' into 3D 2021-05-19 12:48:25 -04:00
Inuyaksa
6514a23aa7 Merge branch 'terrain' into dev 2021-05-18 21:25:32 +02:00
Josh Davidson
77d1a2cfa7 Control: IAE EPR control law 2021-05-18 13:15:09 -04:00
legoboyvdlp R
4b9166605d Leading / with setlistener 2021-05-18 13:02:11 +01:00
Josh Davidson
85486c77da DU: N1 Mode corrections on EWD 2021-05-17 10:55:13 -04:00
Josh Davidson
722c89c27b Control: Start V2500 2021-05-16 18:31:08 -04:00
Josh Davidson
608e06d123 Sim: Add cfm56 to pw temporarily so it starts, add old EGT just temporarily 2021-05-16 16:37:47 -04:00
Josh Davidson
ebcab7f21d Control: Make Alpha Floor and Toga Lk work, DU: fix the a floor message on ECAM 2021-05-16 13:18:18 -04:00
semir
cc885eabe1 MODEL:Minor misaligned UV fix on fwd L/H door(left upper side and edge) 2021-05-16 17:39:36 +02:00
semir
df5019e96c New default liveries: QTR(IAE) and AUA(CFM) 2021-05-16 17:12:16 +02:00
fly
d11a5dac47 Merged 3D into 3D-canvas 
Signed-off-by: fly <merspieler@airmail.cc>
 2021-05-15 18:07:05 +00:00
semir
44f1186f2d Default liveries fixed in regards to last door outline fix commit 2021-05-15 12:37:55 +02:00
semir
2684cb249b MODEL:Further minimal fixes to distorted fwd door outline, paintkit commit will follow. Check your liveries. 2021-05-14 10:34:34 +02:00
semir
b9ffd0226e TEXTURE:Fix for SWR slightly misaligned cross arm on rudder 2021-05-12 22:45:24 +02:00
semir
5224e0e386 MODEL/TEXTURE: Fixed UV distortion around the inner/outer door edge and affected default liveries. You may have to rebuild your liveries! 2021-05-12 18:30:46 +02:00
legoboyvdlp R
3d68a55ef0 Finally fix the electrical system display bug! 2021-05-12 15:27:13 +01:00
semir
9d02c42414 MODEL/TEXTURE:improvement to the nacelle UV mapping 2021-05-07 18:47:49 +02:00
semir
4ac9a3e639 MODEL/TEXTURE: LEAP leftover floating edges removed. Fixed mirrored nacelle vortex generator texture mapping 2021-05-07 15:09:54 +02:00
legoboyvdlp R
414e2f458e Reverser animations 2021-05-06 19:29:16 +01:00
legoboyvdlp R
671a2947aa CFM LEAP animations 2021-05-06 19:05:04 +01:00
legoboyvdlp R
362b8f419d Make LEAP run by adding CFM CEO fadec 2021-05-06 18:51:02 +01:00
semir
bcdf18ec17 MODEL/TEXTURE: LEAP minor fixes to the mesh, materials, texture typo. 2021-05-05 19:06:50 +02:00
semir
3b83b4e9f1 MODEL/TEXTURE: Initial CFM LEAP-1A commit with texture. Normal map is WIP 2021-05-04 20:22:26 +02:00
legoboyvdlp R
37802c6354 Fix property reference 2021-05-03 13:29:56 +01:00
semir
acc5254483 TEXTURE:Inner L/H CFM engine reverser door white instead of black. UV map correction 2021-05-01 12:19:33 +02:00
fly
9e3e11a93b Sidestick priority with indicators and sound 
Signed-off-by: fly <merspieler@airmail.cc>
 2021-04-30 10:13:50 +00:00
semir
84a023bf21 removed redundant objects 2021-04-30 09:10:55 +02:00
Josh Davidson
8befc0458c Sim: FIx engine pos for differential, Control: Fix really broken lever reminder logic 2021-04-29 17:24:50 -04:00
legoboyvdlp R
1861a5f659 3D model :compositor landing lights 2021-04-27 20:33:18 +01:00
Josh Davidson
89b5590d01 Sim: Cleanup more useless sh*t 2021-04-27 08:07:26 -04:00
Josh Davidson
11686f5ef1 VC: make climb detent 25deg as it should be 2021-04-25 21:12:03 -04:00
Josh Davidson
a376044f5c Control: Simulate thrust reversers properly 2021-04-24 13:05:23 -04:00
Josh Davidson
581dd5a1f6 Control: Add mrev limits 2021-04-24 12:03:46 -04:00
Josh Davidson
35d3c7f178 Control: Fix FADEC issues, make throttle lever available to systems 2021-04-23 18:01:12 -04:00
fly
9b07e4637c Pass required var for multiplayer aircraft 
Signed-off-by: fly <merspieler@airmail.cc>
 2021-04-23 20:57:17 +00:00
Josh Davidson
0f4dd9a4b9 FMGC: Install new speed on pitch system, hook up FADEC properly to engage SRS/RWY, bugfixes 2021-04-23 16:30:35 -04:00
Josh Davidson
5df1032bd1 Control: Refine engine control law farther, fix and add flex logic, add limits indications properly 2021-04-23 13:21:07 -04:00
Josh Davidson
e12fda712b FMGC: Update ITAF controller to 4.0.7 beta 3 2021-04-22 18:03:06 -04:00
Josh Davidson
c154cdc0ee Control: Tie fadec into the plane more and add eng 2 control 2021-04-22 17:44:17 -04:00
Josh Davidson
3532ff11a0 FADEC: Redo and begin new system, Control: add simulated drooping 2021-04-22 15:01:55 -04:00
fly
4287c8f747 Fixed element lists 
Signed-off-by: fly <merspieler@airmail.cc>
 2021-04-15 22:35:26 +10:00
Inuyaksa
ada64f22b7 TERR - more consistent green areas display 2021-04-11 23:19:25 +02:00
legoboyvdlp R
135c438e49 Elec: some improvements to the ELEC page 2021-04-04 20:10:40 +01:00
Inuyaksa
49376d15d2 TERR - separated values from each ND 2021-03-24 22:04:08 +01:00
Inuyaksa
188808ce3b TERR fix for mode/range change 
On mode/range change display TERR only, hide numbers.
 2021-03-22 23:01:42 +01:00
Inuyaksa
ec7850ba37 VOR frequency change detection 2021-03-22 00:07:20 +01:00
Inuyaksa
1f10937713 Some optimization with peak calc 2021-03-22 00:06:33 +01:00
fly
089fa1d992 Merged 3D 
Signed-off-by: fly <merspieler@airmail.cc>
 2021-03-14 04:10:31 +11:00
legoboyvdlp R
3f9852d0f0 Merge branch 'dev' into new-electrical 2021-03-11 12:12:23 +00:00
legoboyvdlp R
3a37a2dc42 Merge branch '3D' into cpdlc 2021-03-11 11:45:07 +00:00
legoboyvdlp R
eb8cafceae Merge branch 'dev' into 3D 2021-03-11 11:44:39 +00:00
Inuyaksa
430746b590 vor/adf fix and 000 at ND fresh start 2021-03-03 22:54:43 +01:00
Inuyaksa
164726c371 Update on terrain (low peak) and fix on VOR/ADF NM 2021-03-03 22:34:38 +01:00
Inuyaksa
f3195ab41f fix for empty current leg (not nil) 2021-03-02 22:18:57 +01:00
Inuyaksa
50ce4535a8 mode/range change show/hide phases make a little short 2021-03-02 19:04:53 +01:00
Inuyaksa
23b36c9cac TERR reposition 2021-03-02 19:03:48 +01:00
legoboyvdlp R
f894183cf7 More ATC pages 2021-03-02 17:53:46 +00:00
Inuyaksa
4937aa8b69 better flats detection 2021-03-01 23:57:03 +01:00
Inuyaksa
24c90ebe93 fix for VOR/ADF 2021-03-01 23:56:26 +01:00
legoboyvdlp R
9158416153 MDCU: add ATC pages 2021-03-01 21:12:12 +00:00
Inuyaksa
5a09088e53 show terrr for almost flat peak areas 2021-03-01 21:42:28 +01:00
Inuyaksa
d53003e43d green arrows for ADF on ND 2021-03-01 21:41:29 +01:00
legoboyvdlp R
9c7e8350df Merge branch '3D' into cpdlc 2021-03-01 17:46:44 +00:00
legoboyvdlp R
55f81ab7ab Merge branch 'dev' into 3D 2021-03-01 17:46:09 +00:00
Inuyaksa
f7adf7d2f5 Peak level terrain update 2021-02-28 22:22:36 +01:00
Inuyaksa
6996931252 VOR/ADF arrow and distance update 2021-02-28 22:22:07 +01:00
Inuyaksa
e84d54ff90 Mode/range change - hide trkInd on transition 2021-02-25 21:50:06 +01:00
Inuyaksa
977ffafb66 ND range/mode change modifications, transition hides all route/vor elements 2021-02-25 19:06:38 +01:00
Inuyaksa
7bc27a893e added TERR AHEAD with color 2021-02-25 00:12:04 +01:00
Inuyaksa
ec429b8c83 detection for GPWS alert modes 2021-02-24 23:00:46 +01:00
Inuyaksa
42adeb85ed Display range/mode change msg on ND 2021-02-23 23:18:21 +01:00
Inuyaksa
f74281235c out from func 2021-02-23 23:17:20 +01:00
Inuyaksa
8adc2f3868 fix for trafficGroup on efis 0 missing 2021-02-23 20:50:37 +01:00
Inuyaksa
15f64c5a23 Merge remote-tracking branch 'upstream/dev' into terrain 2021-02-22 23:59:05 +01:00
Inuyaksa
e2c5d2ac22 fix for vor if not set (rotation before setvisible) 2021-02-22 23:58:45 +01:00
Inuyaksa
4ae7bc1a27 terr-on-nd onyl id not plan 2021-02-22 22:34:57 +01:00
Inuyaksa
4db7d57ffa update cyan tile 2021-02-22 22:34:20 +01:00
Inuyaksa
a456722d60 remove old color tiles 2021-02-22 22:34:08 +01:00
Inuyaksa
a09003f642 TERR GPWS button switch terr-on-nd off updating only not buttons state 2021-02-22 22:33:47 +01:00
Inuyaksa
7774678ac0 color tiles update 2021-02-22 21:18:35 +01:00
Inuyaksa
50efa9560f update on green bands calc, altitude expeted at 30s on negative vertical speed 2021-02-22 21:18:22 +01:00
Inuyaksa
fd76d82714 display range fix 2021-02-21 23:01:20 +01:00
Inuyaksa
86bac0ab79 Optimize encoding for tiles and fix some greenish colors 2021-02-21 17:00:14 +01:00
Inuyaksa
d389fa82a1 Better climb and hi ref altitude green levels computation 2021-02-21 16:59:17 +01:00
Inuyaksa
94f95045d7 Some fixes for VOR arrows easing 2021-02-21 16:57:25 +01:00
Inuyaksa
b2eeb04ada better yellow lite 2021-02-19 23:47:54 +01:00
Inuyaksa
cbb633264d ease for VOR arrows 2021-02-19 23:40:58 +01:00
Inuyaksa
789930a560 test on GPWS alert 2021-02-19 23:40:43 +01:00
Inuyaksa
2a46f55c0f better cyan/sea tile 2021-02-19 23:40:22 +01:00
legoboyvdlp R
06e81b2030 SOP: seatbelt, smoking, emer lts to off 2021-02-19 19:42:56 +00:00
Inuyaksa
cb54074596 Merge remote-tracking branch 'upstream/dev' into terrain 2021-02-19 00:17:43 +01:00
Inuyaksa
2864667ef8 better hi/lo ref transition, props changed 2021-02-19 00:17:21 +01:00
Inuyaksa
a3d1bb8b50 Manage fly phases for hi/lo aircraft reference 2021-02-18 00:03:33 +01:00
Inuyaksa
d1433bfde7 New set of tiles 2021-02-18 00:02:18 +01:00
Inuyaksa
5c7b927692 enabled MAP mode 2021-02-18 00:01:53 +01:00
Inuyaksa
1329bc4dae GPWS inhibit switch off terrain on ND 2021-02-18 00:01:23 +01:00
Inuyaksa
b601fd7c2c high/low aircraft relative altitude modes 2021-02-17 00:30:26 +01:00
Inuyaksa
ca09f258c2 fix on altitude reference and first ECAM bind (not working) 2021-02-15 23:59:00 +01:00
Inuyaksa
ce38936d6a Merge remote-tracking branch 'upstream/dev' into terrain 2021-02-15 23:12:46 +01:00
Inuyaksa
77aa7b2429 display water and some optimization on reference calculations 2021-02-15 23:12:07 +01:00
legoboyvdlp R
341e8558ab VERT REV: add ability to change altitude constraints and speed constraints on the page 2021-02-15 17:45:54 +00:00
Inuyaksa
91fb47704e ND separation left/right 2021-02-14 23:50:34 +01:00
Inuyaksa
384c629db0 optimization on speed 2021-02-14 23:11:52 +01:00
Inuyaksa
3f16a74537 fix update hz - display HI/LO on ND 2021-02-14 21:02:32 +01:00
vezza
8ba0263978 Chrono on ND (both sides) 2021-02-14 21:01:00 +01:00
Inuyaksa
112eff4462 skip not visible ft tiles and minor range zoom out 2021-02-13 23:57:09 +01:00
Inuyaksa
5bd45e0709 range changed 2021-02-13 23:21:56 +01:00
Inuyaksa
767d98f42c radar position fixed and range shorted 2021-02-13 23:00:50 +01:00
Inuyaksa
7fac5114e8 fix above colors 2021-02-13 17:06:04 +01:00
Inuyaksa
0026a6e3a3 code update - radar clean func 2021-02-13 11:21:29 +01:00
Inuyaksa
767cbb5918 reverse beacon radar side 2021-02-13 00:39:38 +01:00
Inuyaksa
f2034e0482 Tech version of terrain radar works (at most) 2021-02-13 00:38:43 +01:00
Inuyaksa
c179372ce4 enable print for debuging 2021-02-12 00:23:26 +01:00
Inuyaksa
27b9f47373 prototype for terrain on ND 2021-02-11 23:46:04 +01:00
legoboyvdlp R
6a5d7ad184 Merge fixes 2021-02-11 17:31:40 +00:00
legoboyvdlp R
8692fe1789 Fix merge 2021-02-11 17:22:25 +00:00
legoboyvdlp R
fae0c3fed2 Merge branch 'dev' into 3D 2021-02-11 17:19:39 +00:00
legoboyvdlp R
cf38d944e8 Merge remote-tracking branch 'origin/dev' into tcas 2021-02-09 13:08:32 +00:00
legoboyvdlp R
49559e5a68 Emesary system update framework: this works towards reducing property IO by only ever caling a property once. 2021-02-08 15:52:10 +00:00
legoboyvdlp R
9355d38c46 TCAS --> ABV / BLW work 2021-02-06 11:02:54 +00:00
legoboyvdlp R
4a8dd54f9e Add experimental TCAS layer which should not negatively impact performance like the last one by tdammers 2021-02-03 17:10:05 +00:00
Inuyaksa
7c75030bd3 litlle optiomizations 2021-01-31 23:05:03 +01:00
Inuyaksa
fc643b5f4a a little position fix on ND text GS/TAS 2021-01-31 17:39:06 +01:00
Inuyaksa
5cbdeda625 fix char : in GMT string 2021-01-31 14:38:14 +01:00
Inuyaksa
b5ddaf0169 More smooth easing on compass and little change on ND (wind arrow + GS/TAS size) 2021-01-31 13:58:41 +01:00
Inuyaksa
ea68d8bb3e Merge branch 'dev' into preflight 2021-01-31 11:23:56 +01:00
Inuyaksa
c6568ace49 More realisting compass easing 2021-01-31 11:23:33 +01:00
legoboyvdlp R
77a677ed01 Big improvements to cargo fire / lavatory fire warnings 2021-01-30 21:47:32 +00:00
Inuyaksa
03a15d43c9 Merge branch 'dev' into preflight 2021-01-30 21:58:25 +01:00
Inuyaksa
d017a55d1c heading bug lateral labels and easing on compass 2021-01-30 21:57:43 +01:00
legoboyvdlp R
5cfdd84019 Bugfix IRS MON / POS MON 2021-01-30 20:37:45 +00:00
legoboyvdlp R
f10da37fed Improve PROG (add the BRG / DIST) 2021-01-28 18:57:20 +00:00
legoboyvdlp R
c18c35abc5 GPS MONITOR 2021-01-28 13:59:08 +00:00
legoboyvdlp R
318da4c0a2 Merge branch 'dev' into 3D 2021-01-28 12:00:05 +00:00
legoboyvdlp R
54e89b7e6b Restore fd_complete.ac to state pre last change 2021-01-28 11:58:48 +00:00
legoboyvdlp R
39045f9b69 Fixes for MCDU; add EXCESS MOTION 2021-01-28 11:14:03 +00:00
vezza
5d1a800ce9 Chrono on ND (both sides) 2021-01-27 00:14:02 +01:00
Inuyaksa
1376f31c5f dynamic ACCUR on PROG pages 2021-01-26 23:32:13 +01:00
Inuyaksa
255e0725ab POSMON few fixes 2021-01-25 22:34:44 +01:00
legoboyvdlp R
d2bde4b727 Merge branch 'dev' into new-electrical 2021-01-24 20:44:34 +00:00
Inuyaksa
85b1763a92 bool error + PROGAPPR 
-fix bool on perfTOInput
- back to CLB from PROGAPPR
 2021-01-24 21:03:52 +01:00
Inuyaksa
d52b946b2b Some POSMON layout fix 2021-01-23 23:30:45 +01:00
Inuyaksa
de1c6d7df4 little typo :/ 2021-01-23 21:59:34 +01:00
Inuyaksa
3fa0313582 IRSMON page and (very) basic IRS status display 2021-01-23 21:56:37 +01:00
Inuyaksa
54f6de1f19 added POSMON page 2021-01-23 20:37:04 +01:00
Inuyaksa
7d010f7bf5 VDEV symbol fixed 2021-01-23 00:19:21 +01:00
Inuyaksa
3036056696 PERFTO params not modifiable after prefligh 2021-01-22 23:36:43 +01:00
Inuyaksa
d39f6c89bd little fixes on PROG and PERF pages 2021-01-22 22:14:22 +01:00
Inuyaksa
e08148fdcf PROG pages fix layouts to manual - PROG APPROACH/DONE pages added 2021-01-22 00:44:16 +01:00
legoboyvdlp R
87d2e38767 Goodbye A320-100 2021-01-21 17:02:14 +00:00
legoboyvdlp R
40213dab44 Use acconfig option 2021-01-21 12:56:22 +00:00
legoboyvdlp R
d5c4f80c64 Inhibit canvas in external views (about 3 fps improved for me) 2021-01-21 12:35:22 +00:00
legoboyvdlp R
366c8e4d4c PFD: fix bug where it would desync RHS PFD 2021-01-21 11:56:20 +00:00
Inuyaksa
bc5e48d80a PERFTO as aligned to manual p.145 2021-01-21 11:56:19 +00:00
Inuyaksa
e1a0be5401 cleaning the code 2021-01-21 11:56:17 +00:00
legoboyvdlp R
adaa2eaabe Simplify PFD code by merging loops 2021-01-21 11:56:11 +00:00
Inuyaksa
65705be97b preflight 2021-01-21 11:55:43 +00:00
Inuyaksa
ab603af179 Merge branch 'dev' into preflight 2021-01-20 22:19:39 +01:00
Inuyaksa
b3c34dea15 PERFTO as aligned to manual p.145 2021-01-20 21:50:32 +01:00
Inuyaksa
9b9dc79026 cleaning the code 2021-01-20 21:25:37 +01:00
Inuyaksa
f4ffe335e0 Merge branch 'dev' into preflight 2021-01-20 21:10:42 +01:00
Inuyaksa
da6562bc8a preflight 2021-01-20 20:32:21 +01:00