From 5533721f3c6e55d30427c31f857edc3fd6d61498 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Thu, 3 Jun 2021 10:21:32 -0400
Subject: [PATCH] Added missing bundle/tech entries / Pack debug

---
 core/assets-raw/sprites/pack.json        |  5 ++++-
 core/assets/bundles/bundle.properties    | 11 +++++++++++
 core/src/mindustry/content/TechTree.java | 16 ++++++++++++++++
 gradle.properties                        |  2 +-
 4 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/core/assets-raw/sprites/pack.json b/core/assets-raw/sprites/pack.json
index fcd452dd9f..44984b6426 100644
--- a/core/assets-raw/sprites/pack.json
+++ b/core/assets-raw/sprites/pack.json
@@ -4,5 +4,8 @@
   flattenPaths: true,
   maxWidth: 4096,
   maxHeight: 4096,
-  fast: true
+  fast: true,
+  
+  edgePadding: false,
+  bleed: false
 }
diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index e918d798aa..9eae8eb616 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -1077,6 +1077,11 @@ unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.sei.name = Sei
 unit.omura.name = Omura
+unit.retusa.name = Retusa
+unit.oxynoe.name = Oxynoe
+unit.cyerce.name = Cyerce
+unit.aegires.name = Aegires
+unit.navanax.name = Navanax
 unit.alpha.name = Alpha
 unit.beta.name = Beta
 unit.gamma.name = Gamma
@@ -1288,6 +1293,12 @@ block.exponential-reconstructor.name = Exponential Reconstructor
 block.tetrative-reconstructor.name = Tetrative Reconstructor
 block.payload-conveyor.name = Payload Conveyor
 block.payload-router.name = Payload Router
+block.duct.name = Duct
+block.duct-router.name = Duct Router
+block.duct-bridge.name = Duct Bridge
+block.payload-propulsion-tower.name = Payload Propulsion Tower
+block.payload-void.name = Payload Void
+block.payload-source.name = Payload Source
 block.disassembler.name = Disassembler
 block.silicon-crucible.name = Silicon Crucible
 block.overdrive-dome.name = Overdrive Dome
diff --git a/core/src/mindustry/content/TechTree.java b/core/src/mindustry/content/TechTree.java
index d642808c22..dffa4c0355 100644
--- a/core/src/mindustry/content/TechTree.java
+++ b/core/src/mindustry/content/TechTree.java
@@ -53,7 +53,9 @@ public class TechTree implements ContentList{
                             node(titaniumConveyor, Seq.with(new SectorComplete(craters)), () -> {
                                 node(phaseConveyor, () -> {
                                     node(massDriver, () -> {
+                                        node(payloadPropulsionTower, () -> {
 
+                                        });
                                     });
                                 });
 
@@ -233,7 +235,9 @@ public class TechTree implements ContentList{
                                 });
 
                                 node(repairPoint, () -> {
+                                    node(repairTurret, () -> {
 
+                                    });
                                 });
                             });
                         });
@@ -416,6 +420,18 @@ public class TechTree implements ContentList{
                                     });
                                 });
                             });
+
+                            node(retusa, () -> {
+                                node(oxynoe, () -> {
+                                    node(cyclone, () -> {
+                                        node(aegires, () -> {
+                                            node(navanax, () -> {
+
+                                            });
+                                        });
+                                    });
+                                });
+                            });
                         });
                     });
                 });
diff --git a/gradle.properties b/gradle.properties
index a0baf91624..12e0a58c8a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,4 +9,4 @@ kapt.use.worker.api=true
 kapt.include.compile.classpath=false
 # I don't need to use the kotlin stdlib yet, so remove it to prevent extra bloat & method count issues
 kotlin.stdlib.default.dependency=false
-archash=94cb69e5eb799266de29f7b962597db63b9b0de9
+archash=1a7e355c59f8882526fca13ca70ab2d8396c2322