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

5153 Commits

Author SHA1 Message Date
Rex
19d5170137 Update contributors (#6836) 2022-05-11 20:13:47 -04:00
Anuken
c1e98a1406 Merge branch 'erekir' of https://github.com/Anuken/Mindustry 2022-05-11 14:40:39 -04:00
Anuken
be9b7da892 Automatic consumeCoolant 2022-05-11 14:36:34 -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
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
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
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
15fa120eeb Fixed an issue with three 2022-05-10 17:37:19 -04:00
Epowerj
1eba814e68 adjusted levels three and four for new tech changes 2022-05-10 16:44:19 -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
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
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
Epowerj
6e23fffe41 More level 2 tweaks to make it easier 2022-05-09 13:28:27 -04:00
Epowerj
1668035759 Tweaked clipping issues in onset 2022-05-09 12:45:48 -04:00
Epowerj
79240a45d0 More tweaks to level two - show players they can water cool breach turret 2022-05-09 11:46:11 -04:00
Epowerj
c5cafd5573 Adjustments to level two to make it easier 2022-05-09 11:39:16 -04:00
xem8k5
f16119cd0f Update bundle_zh_CN.properties (#6759) 
* Translation zh_cn partly

* 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

* 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

* 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

* 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

* Update bundle_zh_CN.properties

发觉强化不符合题意，普通容器血量220 容量300，“强化”容器血量480 容量250，反向强化是不是？故固化符合题意
 2022-05-08 21:28:20 -04:00
Github Actions
e69aa6bf49 Automatic bundle update 2022-05-08 16:46:41 +00:00
Anuken
d28a839f55 RTS unit control improvements/fixes 2022-05-08 12:45:48 -04:00
Anuken
61b01892e7 Removed sector 5 2022-05-08 12:19:37 -04:00
Github Actions
f5ef01f01e Automatic bundle update 2022-05-08 13:30:05 +00:00
Anuken
396363c11d Replaced stats entries to assist translation changes 2022-05-08 09:29:10 -04:00
Goobrr
0f3780dbb2 GameOverDialog rework (#6783) 
* GameOverDialog rework

* cleanup
 2022-05-08 09:26:49 -04:00
Anuken
7b47a5cc30 Fixed auto-unlock for campaign sectors 2022-05-07 22:08:49 -04:00
Github Actions
a3ef2a6185 Automatic bundle update 2022-05-07 17:40:26 +00:00
RTOmega
86161ffa4c TR Bundle Update (v7) (#6767) 
* until 574

* TR Bundle Update (v7)
 2022-05-07 13:39:42 -04:00
彭瑞暄
ed40127539 Updated bundle_zh_TW translations (#6754) 
* Update bundle_zh_TW.properties

Translation polish, changed unit from "千" to "K", updated naval support uints.

* Update bundle_zh_TW.properties

Another round of polishing.
 2022-05-07 13:21:03 -04:00
Anuken
5c9ad34322 Map AI rebalancing 2022-05-07 11:47:41 -04:00
Anuken
8b2d4d8f3e Merge remote-tracking branch 'origin/erekir' into erekir 2022-05-07 00:34:31 -04:00
Anuken
c9b9cf6cc4 Fixed potential divide-by-zero in bloom shader 2022-05-07 00:34:28 -04:00
Github Actions
043cd7f5be Automatic bundle update 2022-05-07 04:31:11 +00:00
Anuken
aa0e254f0e Mobile unit command support 2022-05-07 00:30:25 -04:00
Github Actions
88821befe6 Automatic bundle update 2022-05-07 00:35:16 +00:00