Merge remote-tracking branch 'origin/7.0-features' into 7.0-features

core/assets/bundles/bundle.properties

@@ -2008,7 +2008,8 @@ block.shield-breaker.name = Shield Breaker (temp name/sprite)
 block.tank-fabricator.name = Tank Fabricator
 block.mech-fabricator.name = Mech Fabricator
 block.ship-fabricator.name = Ship Fabricator
-block.basic-reconstructor.name = Basic Reconstructor
+block.refabricator.name = Refabricator
+block.prime-refabricator.name = Prime Refabricator
 block.unit-repair-tower.name = Unit Repair Tower
 status.slow.name = Slow
 status.shielded.name = Shielded

core/assets/icons/icons.properties

@@ -233,11 +233,6 @@
 63502=segment|block-segment-ui
 63501=large-overdrive-projector|block-large-overdrive-projector-ui
 63500=disassembler|block-disassembler-ui
-63499=advanced-reconstructor|block-advanced-reconstructor-ui
-63498=reconstructor-basis|block-reconstructor-basis-ui
-63497=reconstructor-morphism|block-reconstructor-morphism-ui
-63496=reconstructor-functor|block-reconstructor-functor-ui
-63495=reconstructor-prime|block-reconstructor-prime-ui
 63494=additive-reconstructor|block-additive-reconstructor-ui
 63493=multiplicative-reconstructor|block-multiplicative-reconstructor-ui
 63492=exponential-reconstructor|block-exponential-reconstructor-ui
@@ -561,3 +556,5 @@
 63129=tecta|unit-tecta-ui
 63128=collaris|unit-collaris-ui
 63127=elude|unit-elude-ui
+63126=refabricator|block-refabricator-ui
+63125=prime-refabricator|block-prime-refabricator-ui

core/src/mindustry/content/Blocks.java

@@ -143,7 +143,7 @@ public class Blocks{
 
     //TODO names
     refabricator,
-    advancedReconstructor,
+    primeRefabricator,
 
     tankAssembler, shipAssembler, mechAssembler,
     basicAssemblerModule,
@@ -4239,7 +4239,8 @@ public class Blocks{
             );
         }};
 
-        advancedReconstructor = new Reconstructor("advanced-reconstructor"){{
+        //yes very silly name
+        primeRefabricator = new Reconstructor("prime-refabricator"){{
             requirements(Category.units, with(Items.thorium, 250, Items.oxide, 200, Items.tungsten, 200, Items.silicon, 400));
             regionSuffix = "-dark";
 

core/src/mindustry/content/ErekirTechTree.java

@@ -299,7 +299,7 @@ public class ErekirTechTree{
                             node(UnitTypes.locus);
 
                             //TODO
-                            node(advancedReconstructor, () -> {
+                            node(primeRefabricator, () -> {
                                 node(UnitTypes.precept);
                                 node(UnitTypes.anthicus);
                                 node(UnitTypes.obviate);

core/src/mindustry/graphics/BlockRenderer.java

@@ -38,6 +38,7 @@ public class BlockRenderer{
     //TODO I don't like this system
     private Seq<UpdateRenderState> updateFloors = new Seq<>(UpdateRenderState.class);
 
+    private boolean hadMapLimit;
     private int lastCamX, lastCamY, lastRangeX, lastRangeY;
     private float brokenFade = 0f;
     private FrameBuffer shadows = new FrameBuffer();
@@ -67,6 +68,7 @@ public class BlockRenderer{
             shadowEvents.clear();
             updateFloors.clear();
             lastCamY = lastCamX = -99; //invalidate camera position so blocks get updated
+            hadMapLimit = state.rules.limitMapArea;
 
             shadows.getTexture().setFilter(TextureFilter.linear, TextureFilter.linear);
             shadows.resize(world.width(), world.height());
@@ -99,8 +101,12 @@ public class BlockRenderer{
             updateDarkness();
         });
 
+        //sometimes darkness gets disabled.
         Events.run(Trigger.newGame, () -> {
-            updateDarkness();
+            if(hadMapLimit && !state.rules.limitMapArea){
+                updateDarkness();
+                renderer.minimap.updateAll();
+            }
         });
 
         Events.on(TilePreChangeEvent.class, event -> {

gradle.properties

@@ -25,4 +25,4 @@ org.gradle.caching=true
 #used for slow jitpack builds; TODO see if this actually works
 org.gradle.internal.http.socketTimeout=100000
 org.gradle.internal.http.connectionTimeout=100000
-archash=9f57abe6d4
+archash=bcd63cbeaa