From 9dffbde8c8f437da36b13da7db42be11b0efa222 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 14 Jun 2020 19:58:08 -0400 Subject: [PATCH 1/4] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 03152f0cf6..8f3f26cc02 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,7 @@ A sandbox tower defense game written in Java. _[Trello Board](https://trello.com/b/aE2tcUwF/mindustry-40-plans)_ _[Wiki](https://mindustrygame.github.io/wiki)_ +_[Javadoc](https://mindustrygame.github.io/docs/)_ ### Contributing From 0a40991c759a7db1b744fa057224461de4016098 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 14 Jun 2020 19:58:19 -0400 Subject: [PATCH 2/4] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8f3f26cc02..06026e0e02 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ A sandbox tower defense game written in Java. _[Trello Board](https://trello.com/b/aE2tcUwF/mindustry-40-plans)_ -_[Wiki](https://mindustrygame.github.io/wiki)_ +_[Wiki](https://mindustrygame.github.io/wiki)_ _[Javadoc](https://mindustrygame.github.io/docs/)_ ### Contributing From 2a7da8c80e4b7ab89cc80e2d1c1716134208041b Mon Sep 17 00:00:00 2001 From: ILiekMelons <49169907+ILiekMelons@users.noreply.github.com> Date: Mon, 15 Jun 2020 01:43:25 +0100 Subject: [PATCH 3/4] Add names for new drones and machines (#2162) * Add in names for drone-related things * Various machines added * extra newline that i removed --- core/assets/bundles/bundle.properties | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index a6b804c4f0..dcbf0e9470 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -1025,6 +1025,19 @@ block.meltdown.name = Meltdown block.container.name = Container block.launch-pad.name = Launch Pad block.launch-pad-large.name = Large Launch Pad +block.segment.name = Segment +block.ground-factory.name = Ground Factory +block.air-factory.name = Air Factory +block.naval-factory.name = Naval Factory +block.additive-reconstructor.name = Additive Reconstructor +block.multiplicative-reconstructor.name = Multiplicative Reconstructor +block.exponential-reconstructor.name = Exponential Reconstructor +block.tetrative-reconstructor.name = Tetrative Reconstructor +block.mass-conveyor.name = Mass Conveyor +block.payload-router.name = Payload Router +block.disasembler.name = Disassembler +block.silicon-crucible.name = Silicon Crucible +block.large-overdrive-projector = Large Overdrive Projector team.blue.name = blue team.crux.name = red team.sharded.name = orange @@ -1212,4 +1225,5 @@ block.spectre.description = A massive dual-barreled cannon. Shoots large armor-p block.meltdown.description = A massive laser cannon. Charges and fires a persistent laser beam at nearby enemies. Requires coolant to operate. block.command-center.description = Issues movement commands to allied units across the map.\nCauses units to rally, attack an enemy core or retreat to the core/factory. When no enemy core is present, units will default to patrolling under the attack command. block.repair-point.description = Continuously heals the closest damaged unit in its vicinity. +block.segment.description = Damages and destroys incoming projectiles. Laser projectiles are not targeted. From dbe482d494a01057e97bd117a9bb548db912d3f3 Mon Sep 17 00:00:00 2001 From: ILiekMelons <49169907+ILiekMelons@users.noreply.github.com> Date: Mon, 15 Jun 2020 14:44:38 +0100 Subject: [PATCH 4/4] Fixed disassembler and overdrive projector (#2163) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I misspelt disassembler and forgot to put a .name somewhere 😅 --- core/assets/bundles/bundle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index dcbf0e9470..3f0eac6a6f 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -1035,9 +1035,9 @@ block.exponential-reconstructor.name = Exponential Reconstructor block.tetrative-reconstructor.name = Tetrative Reconstructor block.mass-conveyor.name = Mass Conveyor block.payload-router.name = Payload Router -block.disasembler.name = Disassembler +block.disassembler.name = Disassembler block.silicon-crucible.name = Silicon Crucible -block.large-overdrive-projector = Large Overdrive Projector +block.large-overdrive-projector.name = Large Overdrive Projector team.blue.name = blue team.crux.name = red team.sharded.name = orange