mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-02 12:23:47 +07:00
Code Issues Packages Projects Releases Wiki Activity
14,351 Commits 4 Branches 160 Tags 2.3 GiB
650b67365b
Commit Graph

14351 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken
650b67365b Fixed #6829 2022-05-11 16:58:18 -04:00
Anuken
c1e98a1406 Merge branch 'erekir' of https://github.com/Anuken/Mindustry 2022-05-11 14:40:39 -04:00
Anuken
3554d64573 Merge branch 'master' of https://github.com/Anuken/Mindustry 2022-05-11 14:36:36 -04:00
Anuken
be9b7da892 Automatic consumeCoolant 2022-05-11 14:36:34 -04:00
JniTrRny
849d0b6223
newline for those unfortunate mobile players (#6828) 2022-05-11 14:28:04 -04:00
Rex
2da60c4efc
Update bundle_es.properties (#6826) 
I just realized that they are turrets and not blocks
 2022-05-11 14:04:32 -04:00
dead inside
4d12ac8ed6
A better way to do this (#6827) 2022-05-11 14:01:10 -04:00
Anuken
f54116425d Bugfixes 2022-05-11 12:33:10 -04:00
Anuken
25cc53625c Merge remote-tracking branch 'origin/master' 2022-05-11 12:02:25 -04:00
Anuken
2beca30b0c Spore press craft time fix 2022-05-11 12:02:19 -04:00
Github Actions
4ac87ec61a Automatic bundle update 2022-05-11 14:15:24 +00:00
Rex
beae0662ce
Update bundle_es.properties (#6825) 2022-05-11 10:14:12 -04:00
snusunny
72f4d67a3b
[KO] Fix incorrect translations (#6823) 
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- Fixed condensers being translated into *electric* condensers
- Fixed incorrect core names
- Made team names (derelict, sharded, crux ectc.) be proper nouns (고유명사) like you asked
- Fixed blast doors being translated as blast *compound* doors
- some other small fixes
 2022-05-11 10:02:00 -04:00
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
0fa280c964 fix random errors 2022-05-10 20:50:36 -04:00
Anuken
211cf250dc deploy script for jitpack 2022-05-10 20:46:53 -04:00
Anuken
e15ed4403c Unignore icons.properties 2022-05-10 20:38:05 -04:00
Anuken
9d65aa014c dfgnb 2022-05-10 20:30:07 -04:00
Anuken
8fad5a1757 Horrible 2022-05-10 20:28:09 -04:00
Anuken
60d3a51ebc What a horrible waste of time 2022-05-10 20:08:48 -04:00
Anuken
0218e2ed2d Package publish token fix 2022-05-10 19:47:40 -04:00
Anuken
0169a925ef Testing Github Packages 2022-05-10 19:43:47 -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
be3e487fae Trigger BE build 2022-05-10 18:44:52 -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
Sam Bloom
54daf78cbc
add omega network back (#6810) 2022-05-10 18:12:32 -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