Merge branch 'master' of https://github.com/Anuken/Mindustry into tsunami

Conflicts: core/assets/icons/icons.properties core/assets/sprites/block_colors.png core/assets/sprites/fallback/sprites.atlas core/assets/sprites/fallback/sprites3.png core/assets/sprites/fallback/sprites4.png core/assets/sprites/fallback/sprites5.png core/assets/sprites/fallback/sprites7.png core/assets/sprites/fallback/sprites8.png core/assets/sprites/sprites.atlas core/assets/sprites/sprites.png core/assets/sprites/sprites2.png core/assets/sprites/sprites4.png core/assets/sprites/sprites5.png core/src/mindustry/content/Blocks.java
2020-09-30 09:48:18 +03:00
parent fb53abe593 3c3c15dcf4
commit d4402ee3bb
33 changed files with 13791 additions and 13571 deletions
@@ -109,6 +109,9 @@ public class TechTree implements ContentList{

                node(Items.coal, with(Items.lead, 3000), () -> {
                    node(Items.graphite, with(Items.coal, 1000), () -> {
+                        node(illuminator, () -> {
+                        });
+
                        node(graphitePress, () -> {
                            node(Items.titanium, with(Items.graphite, 6000, Items.copper, 10000, Items.lead, 10000), () -> {
                                node(pneumaticDrill, () -> {
@@ -351,8 +354,10 @@ public class TechTree implements ContentList{
                        });

                        node(lancer, () -> {
-                            node(meltdown, () -> {
+                            node(foreshadow, () -> {
+                                node(meltdown, () -> {

+                                });
                            });

                            node(shockMine, () -> {