Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,200 Commits 4 Branches 180 Tags
f8580d29fc19bec9f040897ebcb02242bdf722d6
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Epowerj 39fa64a41c Merge remote-tracking branch 'origin/master' 2022-09-02 15:23:27 -04:00
Epowerj cf8861bb13 Caldera tweaks 2022-09-02 15:22:18 -04:00
Epowerj 8b629b9b8b Merge remote-tracking branch 'origin/master' 2022-09-01 20:56:42 -04:00
Epowerj 296fc338f9 Caldera tweaks 2022-09-01 20:56:28 -04:00
Epowerj c1775bf16b Tweaked tech tree for caldera 2022-09-01 20:56:14 -04:00
Epowerj 2bbcf601aa Tweaked research costs for caldera unlocks 2022-09-01 20:56:06 -04:00
Epowerj 5810e308d4 Fixed bundle names for caldera 2022-09-01 20:55:54 -04:00
Epowerj f1d4ec004d Removed banned blocks from ravine 2022-08-31 19:07:21 -04:00
Epowerj be2160c9df Tech tree updates for caldera 2022-08-31 18:56:27 -04:00
Epowerj a7ffaff270 Tweaks to caldera 2022-08-31 18:56:09 -04:00
Epowerj 72db5ff9f7 Added caldera to bundles 2022-08-31 18:56:00 -04:00
Epowerj 7e6ba4a98e Added caldera to the campaign 2022-08-31 18:15:56 -04:00
Epowerj 8c5f6bf171 Rename caldera map file to distinguish from the serpulo map 2022-08-31 01:08:17 -04:00
EpowerjandGitHub 342fb3998f Merge pull request #7487 from hhhi17/master 
Added caldera - thanks to hhhi17 for the map
 2022-08-31 01:03:27 -04:00
Epowerj a0cc74891a Merge branch 'map1' 2022-08-30 15:53:09 -04:00
Epowerj 68fc855870 Tweaks to ravine 2022-08-30 15:50:40 -04:00
Epowerj 26dc90e5a2 Hold back slag heater unlock until [4] 2022-08-30 14:56:58 -04:00
Epowerj 953b43e041 Tweaks to afflict research cost 2022-08-30 14:52:37 -04:00
Epowerj 400155ffed Tweaks to ravine 2022-08-30 14:44:36 -04:00
Epowerj 9dbdb05ede Rearranged tech tree for turrets 2022-08-30 14:43:47 -04:00
Epowerj 19ca24825c Tweaks to surge block research costs 2022-08-30 14:05:05 -04:00
Epowerj 6e9ddea56e Tweaks to ravine 2022-08-30 13:31:09 -04:00
Epowerj 9996f3b6f5 Set a capture wave for ravine 2022-08-29 20:06:27 -04:00
Epowerj ef02906db4 Tweaks to ravine 2022-08-29 19:10:49 -04:00
Epowerj 715dfb16ca Adjusted tech tree for ravine 2022-08-29 18:46:34 -04:00
Epowerj d5c8f66d53 Peaks tweaks 2022-08-29 18:10:59 -04:00
Epowerj 76997f8d47 typo 2022-08-29 17:49:03 -04:00
Epowerj 697e6d503f Added ravine to campaign list 2022-08-29 17:44:19 -04:00
Epowerj b495308832 Tweaks to ravine 2022-08-29 17:33:05 -04:00
EpowerjandGitHub b7ca88c9c5 Merge pull request #7476 from ThatOneBepis/master 
Map submission from ThatOneBepis - thanks for the map.
 2022-08-29 16:54:26 -04:00
Epowerj 9fd340d219 Tweaks to basin description 2022-08-26 12:31:42 -04:00
Epowerj 53ed4dd072 Tweaks to basin 2022-08-26 12:27:11 -04:00
Epowerj 9f7d2b180e Merge branch 'maps_phase_2' 2022-08-25 01:15:59 -04:00
Epowerj 8bc05be30e Tweaks on peaks :) 2022-08-25 01:13:34 -04:00
Epowerj b8349bae19 Tweaks on peaks :) 2022-08-25 00:53:49 -04:00
Epowerj c6ec64cde2 Changed ship refabricator research cost 2022-08-25 00:02:49 -04:00
Epowerj 07d7eda4c8 Chemical combustion chamber buff 2022-08-24 22:08:43 -04:00
Epowerj a2dbe20885 Made citadel core locked behind peaks for now 2022-08-24 21:57:36 -04:00
Epowerj 3b239ee368 Changed sublimate research requirements 2022-08-24 21:56:46 -04:00
Epowerj 94690b6edd Tweaks to marsh 2022-08-24 21:49:13 -04:00
Epowerj 4ed4399e54 Progress on peaks 2022-08-23 23:09:43 -04:00
Epowerj 9a0713523d Progress on peaks 2022-08-22 20:38:23 -04:00
Epowerj 14da646c57 Progress on peaks 2022-08-22 18:42:39 -04:00
Epowerj ce8d51e18e Work on peaks 2022-08-10 10:52:59 -04:00
Epowerj 648a4b5e61 Tweaked tech tree for peaks 2022-08-09 19:45:51 -04:00
Epowerj 1d25b9e0bc Merge branch 'master' of https://github.com/Anuken/Mindustry into maps_phase_2 2022-08-09 18:57:26 -04:00
Epowerj bc38d71f98 Progress on peaks 2022-08-09 16:52:36 -04:00
Epowerj 9f9e854c5f Progress on peaks 2022-08-09 16:47:13 -04:00
Epowerj 43937db6df Added peaks to tech tree 2022-08-09 15:50:45 -04:00
Epowerj 63cf6f6fb2 Reduced breach tungsten damage 2022-08-09 15:49:51 -04:00
Epowerj 2344cc442b Added peaks to code 2022-08-09 15:47:43 -04:00
Epowerj 48cb99774a Added peaks 2022-08-09 15:46:32 -04:00
Epowerj 901d0106c0 Merge branch 'master' of https://github.com/Anuken/Mindustry into maps_phase_2 2022-08-08 17:45:06 -04:00
Epowerj f4798f5adc hid a bunch of stuff from the tech tree for now 2022-08-08 15:54:33 -04:00
Epowerj 4b9b4f3c0b Progress on marsh 2022-08-06 15:03:36 -04:00
Epowerj 33ef30923b Progress on marsh 2022-08-05 19:13:51 -04:00
Epowerj a127302aae Progress on marsh 2022-08-05 18:26:09 -04:00
Epowerj 605f727f22 Progress on marsh 2022-08-05 18:11:19 -04:00
Epowerj b1ad070f80 Progress on marsh 2022-08-05 17:34:56 -04:00
Epowerj dc92222d98 Merge branch 'master' of https://github.com/Anuken/Mindustry into maps_phase_2 2022-08-05 17:06:47 -04:00
Epowerj 4f652852ec Progress on marsh 2022-08-05 17:04:40 -04:00
Epowerj aa7576758a Tweaks on basin 2022-08-05 15:52:16 -04:00
Epowerj d882dcf395 Marsh is probably testable now once Anuke is done with ground beryllium rebalancing 2022-08-04 19:28:31 -04:00
Epowerj f728bd643a Merge branch 'master' of https://github.com/Anuken/Mindustry into maps_phase_2 2022-08-04 19:02:22 -04:00
Epowerj 1fa34518d6 Progress on marsh 2022-08-04 19:02:11 -04:00
Epowerj 1245ff006f Progress on marsh 2022-08-04 18:45:26 -04:00
Epowerj f6b5962997 Merge branch 'master' of https://github.com/Anuken/Mindustry into maps_phase_2 
 Conflicts:
	core/src/mindustry/content/Blocks.java
 2022-08-04 14:55:14 -04:00
Epowerj e3566bda28 Progress on marsh 2022-08-04 14:32:05 -04:00
Epowerj d9312bc960 Progress on marsh 2022-08-04 13:51:41 -04:00
Epowerj d6a0ce0fce Progress on marsh 2022-08-03 21:09:37 -04:00
Epowerj 8a51ac0bdc More work on marsh 2022-08-03 16:33:21 -04:00
Epowerj 00d6a73c27 Tweaked tech tree and for marsh 2022-08-03 16:33:14 -04:00
Epowerj e2dea0f84e Begin rework of basin 2022-08-02 18:32:26 -04:00
Epowerj d77afbea06 Being work on marsh 2022-08-02 18:17:53 -04:00
Epowerj 2332d9bee1 Tweaked intersect 2022-07-18 13:41:04 -04:00
Epowerj a36a87fa83 Added an extra island to lake 2022-07-18 13:37:18 -04:00
Epowerj 1529d4ecc9 Tweaked aegis 2022-07-18 11:22:26 -04:00
Epowerj fceec59a61 Added more resources to onset 2022-07-18 11:21:13 -04:00
Epowerj 6aa9623512 Added a temporary description for four 2022-07-14 15:44:32 -04:00
Epowerj b8d3318d0b Added objectives to split 2022-07-14 15:27:35 -04:00
Epowerj f149bed64e Tweaked split 2022-07-14 15:11:11 -04:00
Epowerj 9d3bf2d489 Tweaked split 2022-07-14 15:06:57 -04:00
Epowerj 251404f29e Rearranged some transport tech on the tree 2022-07-14 14:54:47 -04:00
Epowerj 43416f90e5 Added description to split 2022-07-14 14:50:00 -04:00
Epowerj a68b2fad11 Fixed research tree issue that prevented unlocking split 2022-07-14 14:49:41 -04:00
Epowerj 3a3eb2c63d Progress on split 2022-07-13 15:05:52 -04:00
Epowerj 24e70faf02 Start reworking split 2022-07-12 20:37:17 -04:00
Epowerj e79763d139 Changed payload build requirements 2022-07-12 20:36:57 -04:00
Epowerj ecc9dd7a7f Made reinforced container cheaper and smaller 2022-07-12 19:03:23 -04:00
Epowerj 352fa4e18f Merge branch 'master' of https://github.com/Anuken/Mindustry into maps 2022-07-11 23:08:33 -04:00
Epowerj b29b6b38e7 rearranged tech tree 2022-07-11 21:36:31 -04:00
Epowerj 458ab9d639 tweaked atlas 2022-07-11 21:36:15 -04:00
Epowerj ca18b851a1 Tweaked atlas, set max squad size 2022-07-11 18:44:28 -04:00
Epowerj 4812ff47c0 Merge branch 'master' of https://github.com/Anuken/Mindustry into maps 2022-07-11 18:39:06 -04:00
Epowerj 7aea85668b forgot period lol 2022-07-11 17:15:11 -04:00
Epowerj 9413a399cd Merge branch 'master' of https://github.com/Anuken/Mindustry into maps 
 Conflicts:
	core/assets/bundles/bundle_fi.properties
	core/assets/bundles/bundle_th.properties
 2022-07-11 17:14:39 -04:00
Epowerj 735d81e42b Typo 2022-07-11 17:03:55 -04:00
Epowerj 4746cdbb6b Added description to atlas 2022-07-11 17:02:22 -04:00
Epowerj 1124f5f369 Fixed issue with level four unlocking early 2022-07-10 17:05:23 -04:00
Epowerj 5d852085c2 Tweaked three 2022-07-08 18:35:56 -04:00