Commit Graph
4885 Commits
Author SHA1 Message Date
epowerj d66c386881 Merge remote-tracking branch 'origin/7.0-features' into 7.0-features
# Conflicts:
#	core/assets/maps/onset.msav
2022-01-23 17:02:39 -05:00
epowerj 4bdfa894af Updated onset map to remove some areas and add derelict storage 2022-01-23 17:00:27 -05:00
Anuken 8853afc221 Removed unused coral chunk block 2022-01-23 16:58:52 -05:00
Anuken abf429acb1 Unit wall mining 2022-01-23 16:57:09 -05:00
Anuken 608e25c2ee Research tweaks 2022-01-23 15:45:40 -05:00
Anuken 56334d9199 Misc bugfixes 2022-01-23 15:34:51 -05:00
Anuken 5a2d69278b Unlock necessary blocks before landing 2022-01-23 15:28:12 -05:00
Anuken b281f29f01 Onset 4 waves 2022-01-23 14:41:58 -05:00
Anuken 4497f7ab3a Proper interplanetary launch 2022-01-23 14:37:08 -05:00
Anuken d9bcdf3f37 Cleanup 2022-01-22 16:47:59 -05:00
Anuken 48585274cf Onset sector 2022-01-22 16:43:36 -05:00
Anuken fdcc373813 Editor experimental sector generator 2022-01-22 15:06:46 -05:00
Anuken 97da66cd44 New environment blocks 2022-01-22 13:33:16 -05:00
CPXMCandGitHub 30070ce759 Change my main name in Contributors (#6513)
CPXMC to PCX-LK
2022-01-21 20:05:48 -05:00
Anuken cfb01063c0 Misc map creation utilities 2022-01-21 16:32:35 -05:00
Anuken 8fc7aff7ef More decoration blocks 2022-01-20 15:49:47 -05:00
Anuken 0e790e61f2 Generation tweaks 2022-01-20 15:19:03 -05:00
Anuken 698e89e796 Editor fixes 2022-01-19 22:23:50 -05:00
Anuken 45178046d0 Crystal blocks 2022-01-19 21:24:02 -05:00
Anuken 4bee7e598b Red ice boulders 2022-01-19 18:54:15 -05:00
Anuken 7240da5016 More crystals 2022-01-18 22:47:31 -05:00
Anuken 19ddc1dd65 WIP crystal biome 2022-01-18 20:35:43 -05:00
Anuken f3811d6710 Ore renaming 2022-01-18 10:48:27 -05:00
VizardAlphaandGitHub 3311e40906 Update bundle_fr.properties (#6373)
* Update bundle_fr.properties

* Removes -> Destroys..
2022-01-17 23:18:41 -05:00
彭瑞暄andGitHub b8842a34ae Update bundle_zh_TW.properties (#6470) 2022-01-17 21:58:26 -05:00
Anuken d1206d2e2f Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
 Conflicts:
	core/src/mindustry/world/blocks/defense/turrets/Turret.java
2022-01-17 15:44:09 -05:00
Paweł StolarskiandGitHub 6a75d84f48 Evolveye (polish translator of 3.x version) (#6502) 2022-01-17 14:53:35 -05:00
Anuken 2d19c7ae97 Bulwark shield mechanics mostly done 2022-01-17 13:39:15 -05:00
Anuken 396c087072 Experimenting with abilities 2022-01-16 22:53:58 -05:00
Anuken b23ea8b965 WIP 'bulwark' unit 2022-01-16 16:26:21 -05:00
Anuken e14dd00019 Quell missile weapons 2022-01-15 15:57:53 -05:00
Anuken e563ce9dcd Erekir clouds 2022-01-14 13:11:52 -05:00
Anuken 580e830300 Erekir gen fix 2022-01-13 23:33:12 -05:00
Anuken 10d8e63368 Multi-liquid sublimate 2022-01-10 14:01:30 -05:00
Anuken acaec08781 Evoke repair weapon 2021-12-28 21:48:32 -05:00
Anuken 0ede0dbf0c 5x5 burst drill 2021-12-28 19:18:16 -05:00
Anuken 4e1dec2399 More turret cleanup 2021-12-27 16:41:03 -05:00
Anuken 677abf4924 3x3 breach 2021-12-27 15:54:09 -05:00
Anuken dd5ce7e365 Regen suppression unit + system 2021-12-27 14:46:51 -05:00
Anuken 4fbeae1afc Erekir tech sector requirements 2021-12-25 22:17:18 -05:00
Anuken 180e527a18 Beryllium wall 2021-12-24 13:23:47 -05:00
Anuken 45b81fae37 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-12-21 10:39:49 -05:00
Anuken 430fe2fd0a Unit assembly finalizations 2021-12-19 20:31:00 -05:00
Anuken 41b669d6e1 Unit assembly system progress 2021-12-18 11:50:21 -05:00
Anuken 3866a9a8e7 the obligatory daily commit 2021-12-17 17:55:03 -05:00
Anuken e481de9d28 Payload router sorter mode 2021-12-16 10:31:16 -05:00
Anuken 00ed0d017c Unit assembly drones + more visuals 2021-12-15 14:51:42 -05:00
KuhnChrisandGitHub 4b6541ae4e Update missing "core launch animation skip" in german translation file (bundle_de) (#6430)
* Update settings file (bundle_de)

* Update bundle_de.properties
2021-12-14 12:52:26 -05:00
Anuken bdc3b85346 Unit assembler progress 2021-12-13 23:14:26 -05:00
Anuken 5ac3e08b1d Tungsten walls 2021-12-13 14:42:16 -05:00