Merge branch 'master' into master

2019-07-14 15:10:32 +01:00
parent 7161870c8b 090decbbc1
commit f77bcc9765
92 changed files with 834 additions and 565 deletions
@@ -81,7 +81,7 @@
 #define INIT_ORDER_STICKY_BAN		-10
 #define INIT_ORDER_LIGHTING			-20
 #define INIT_ORDER_SHUTTLE			-21
-#define INIT_ORDER_SQUEAK			-40
+#define INIT_ORDER_MINOR_MAPPING	-40
 #define INIT_ORDER_PATH				-50
 #define INIT_ORDER_PERSISTENCE		-100