Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,442 Commits 4 Branches 180 Tags
eb6c0ebfb5a928f40c74e63bdfdd101a71fd3236
Commit Graph

12195 Commits

Author SHA1 Message Date
Anuken
60cb4a2a73 Merge remote-tracking branch 'origin/master' 2022-05-11 09:42:21 -04:00
Anuken
35f07150f2 aaa 2022-05-11 09:42:17 -04:00
Lucky Clover
c9ee471b34 Fix show wrong output liquid icon (#6819) 
Fix show output liquid icon if rotate non-specified output liquids factory like melter.
 2022-05-11 09:41:53 -04:00
Anuken
debf940973 Fixed preview render crash 2022-05-11 09:39:43 -04:00
Anuken
9b33ab3c0a Fixed #6815 2022-05-11 00:44:15 -04:00
Anuken
24a6ef2bc3 Correct team usage 2022-05-10 23:13:59 -04:00
Anuken
afe02bf3a0 Misc fixes 2022-05-10 22:55:28 -04:00
Anuken
aa3bf50731 Merge remote-tracking branch 'origin/master' 2022-05-10 21:56:41 -04:00
Anuken
8c98f8f9bf Mass driver reloadTime -> reload 2022-05-10 21:56:34 -04:00
Somka000
64e5561b5a Translate things from Erekir and some other (#6812) 2022-05-10 21:16:32 -04:00
Anuken
2e4037451f Merge branch 'erekir' of https://github.com/Anuken/Mindustry 2022-05-10 21:07:48 -04:00
Yuri Polyakov
99f98cc761 Update bundle_ru.properties (#6760) 
* Update bundle_ru.properties

* Update bundle_ru.properties

упс

Co-authored-by: Anuken <arnukren@gmail.com>
 2022-05-10 21:07:33 -04:00
Yuri Polyakov
05cbc8a477 Update bundle_ru.properties (#6762) 
* Update bundle_ru.properties

* Update bundle_ru.properties
 2022-05-10 21:07:13 -04:00
Anuken
e15ed4403c Unignore icons.properties 2022-05-10 20:38:05 -04:00
Anuken
60d3a51ebc What a horrible waste of time 2022-05-10 20:08:48 -04:00
Anuken
8f31faa98e Merge remote-tracking branch 'origin/master' 2022-05-10 19:19:38 -04:00
Anuken
6a129371d2 Fixed #6811 2022-05-10 19:19:21 -04:00
Github Actions
05578fe8b7 Automatic bundle update 2022-05-10 23:02:41 +00:00
Anuken
6bda5546a6 Merge branch 'erekir' of https://github.com/Anuken/Mindustry 2022-05-10 19:01:40 -04:00
Anuken
0c6c9620a7 lang 2022-05-10 19:01:33 -04:00
end-me-please
9b8a09892a Update bundle_de.properties (#6768) 
aHR0cHM6Ly9pLmltZ3VyLmNvbS9NSG1kV0plLnBuZw==
 2022-05-10 18:58:36 -04:00
Github Actions
fbf70224e4 Automatic bundle update 2022-05-10 22:58:02 +00:00
Nunting
3db6637e9f Update bundle_ko.properties (#6763) 
* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

Co-authored-by: Anuken <arnukren@gmail.com>
 2022-05-10 18:56:56 -04:00
Anuken
a089afc626 Merge branch 'master' of https://github.com/Anuken/Mindustry into erekir 
 Conflicts:
	core/assets/bundles/bundle_zh_TW.properties
 2022-05-10 18:15:43 -04:00
Epowerj
6c39249899 Fixed waves on level three not working right with new map changes 2022-05-10 18:14:56 -04:00
Epowerj
b7eeec243e Merge remote-tracking branch 'origin/erekir' into erekir 2022-05-10 17:37:25 -04:00
Epowerj
15fa120eeb Fixed an issue with three 2022-05-10 17:37:19 -04:00
Anuken
01ba06ddef Faster erekir mining speed 2022-05-10 17:35:43 -04:00
Epowerj
1eba814e68 adjusted levels three and four for new tech changes 2022-05-10 16:44:19 -04:00
Anuken
eb8395fa19 Requirement swapbac 2022-05-10 16:25:06 -04:00
Anuken
4ddcd57191 Merge branch 'erekir' of https://github.com/Anuken/Mindustry into erekir 2022-05-10 16:21:24 -04:00
Anuken
cffba7b685 Made useless items/liquids/blocks hidden 2022-05-10 16:21:22 -04:00
dead inside
7683214eff BuildTurret infinite resources fix (#6808) 
* BuildTurret infinite resources fix

* I'm not a good script kiddie

Too much Testing Utilities has plagued me

* Team infinite resources as well
 2022-05-10 16:04:30 -04:00
Anuken
36513d6ed6 Tech tree restructuring 2022-05-10 16:01:49 -04:00
Anuken
3dd17474c5 Fixed OpenGL vertex arrays / Fixed bullet shrink crop 2022-05-10 13:12:12 -04:00
Anuken
9ac75df34e Merui swap / Bomber command support 2022-05-10 11:13:13 -04:00
Anuken
85d7f2cd62 Bugfixes 2022-05-10 10:17:43 -04:00
Anuken
ca67b0f43c launchCapacityMultiplier per-planet 2022-05-10 00:24:44 -04:00
Anuken
6efca04ea8 and gone 2022-05-09 23:50:01 -04:00
Anuken
95254eef44 Duct router distribution fixes 2022-05-09 23:11:52 -04:00
Anuken
051a41e86d String overload for mod options 2022-05-09 22:35:58 -04:00
Anuken
83d15ce65e Merge remote-tracking branch 'origin/erekir' into erekir 2022-05-09 20:51:31 -04:00
Anuken
2162770e57 Custom settings categories 2022-05-09 20:51:27 -04:00
xem8k5
db947d33ca Update bundle_zh_CN.properties twice (#6802) 
* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties
 2022-05-09 20:06:23 -04:00
Anuken
aa1abeb4be Typo fixes 2022-05-09 19:55:51 -04:00
Anuken
2b46bbfd2c Merge remote-tracking branch 'origin/erekir' into erekir 2022-05-09 18:24:31 -04:00
Anuken
76f1cfbc07 Actually fixed Serpulo base gen 2022-05-09 18:24:27 -04:00
Github Actions
1a07b1514f Automatic bundle update 2022-05-09 21:42:41 +00:00
Anuken
31c5ef2dc5 Some world processor documentation 2022-05-09 17:41:42 -04:00
Anuken
cf1fb98d5c Misc bugfixes 2022-05-09 17:33:43 -04:00