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

210 Commits

Author SHA1 Message Date
Epowerj
4812ff47c0 Merge branch 'master' of https://github.com/Anuken/Mindustry into maps 2022-07-11 18:39:06 -04:00
Github Actions
9d4839b26d Automatic bundle update 2022-07-11 22:19:30 +00:00
Github Actions
a7db6d86ff Automatic bundle update 2022-07-11 21:16:23 +00: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
Github Actions
788e63cf28 Automatic bundle update 2022-07-11 18:39:05 +00:00
Github Actions
cbc4c0d3b2 Automatic bundle update 2022-07-09 04:34:18 +00:00
Github Actions
0182e61803 Automatic bundle update 2022-07-07 21:04:47 +00:00
Github Actions
5ea8538e0f Automatic bundle update 2022-07-07 01:29:48 +00:00
Github Actions
5e45b64ee1 Automatic bundle update 2022-07-06 17:00:37 +00:00
Github Actions
85321d7465 Automatic bundle update 2022-07-05 22:42:07 +00:00
Lucky Clover
cdbe1a9123 revert the most vehemently OPPOSED zh-CN translation (#7112) 2022-07-03 14:49:24 -04:00
xem8k5
dd3f507b97 Update bundle_zh_CN.properties (#7107) 2022-07-02 10:17:50 -04:00
Github Actions
97d077df84 Automatic bundle update 2022-07-01 16:52:44 +00:00
xem8k5
f594461971 Update bundle_zh_CN.properties for scathe (#7095) 
* 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-07-01 11:50:03 -04:00
Github Actions
261714d395 Automatic bundle update 2022-06-30 03:04:25 +00:00
Github Actions
82b3bd7520 Automatic bundle update 2022-06-29 22:51:22 +00:00
Github Actions
4f0e634b42 Automatic bundle update 2022-06-27 16:54:13 +00:00
xem8k5
82ffa91b49 Update bundle_zh_CN.properties aaaaaagain (#7072) 
* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties
 2022-06-27 12:53:01 -04:00
Github Actions
8f0b8c1277 Automatic bundle update 2022-06-27 13:57:57 +00:00
Github Actions
0698c5dd8f Automatic bundle update 2022-06-26 15:52:10 +00:00
Github Actions
6f3c91c241 Automatic bundle update 2022-06-25 13:08:30 +00:00
Github Actions
8b66107833 Automatic bundle update 2022-06-24 00:58:28 +00:00
Github Actions
54c4859e92 Automatic bundle update 2022-06-22 18:20:29 +00:00
xem8k5
53f4bf7b78 Update bundle_zh_CN.properties by lastcommanded and so on (#7036) 
* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties
 2022-06-22 14:19:07 -04:00
Github Actions
2f45ec7c90 Automatic bundle update 2022-06-20 23:37:58 +00:00
Github Actions
3137ec09e3 Automatic bundle update 2022-06-19 14:58:55 +00:00
Github Actions
58e274b29f Automatic bundle update 2022-06-17 22:20:30 +00:00
Github Actions
6db20908b3 Automatic bundle update 2022-06-16 19:35:33 +00:00
xem8k5
d3e5a139e3 Update bundle_zh_CN.properties (#7017) 2022-06-14 22:40:22 -04:00
Github Actions
22c5002931 Automatic bundle update 2022-06-14 01:10:07 +00:00
xem8k5
2c197aae7c Update bundle_zh_CN.properties again (#7001) 
* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties
 2022-06-11 08:17:10 -04:00
Github Actions
5ccc7d44db Automatic bundle update 2022-06-08 14:36:04 +00:00
Github Actions
642f1f74af Automatic bundle update 2022-06-08 13:21:24 +00:00
Github Actions
17bb8738cc Automatic bundle update 2022-06-08 13:06:22 +00:00
Github Actions
91643d94c4 Automatic bundle update 2022-06-08 12:58:35 +00:00
Github Actions
48b19751a3 Automatic bundle update 2022-05-12 04:07:42 +00:00
xem8k5
699a8929e4 Fix bundle_zh_CN.properties (#6844) 
* Fix bundle_zh_CN.properties

block.tank-refabricator.name = 坦克重构厂
block.mech-refabricator.name = 爬虫重构厂
block.ship-refabricator.name = 飞艇重构厂

Now is "refabricator"？

* Update bundle_zh_CN.properties
 2022-05-12 00:06:47 -04:00
Github Actions
eff4e91207 Automatic bundle update 2022-05-11 23:28:53 +00:00
xem8k5
37a46282f2 Update bundle_zh_CN.properties the third time (#6834) 
* Update bundle_zh_CN.properties the third time

Fixed various grammar issues

* Update bundle_zh_CN.properties
 2022-05-11 19:27:58 -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
Github Actions
1a07b1514f Automatic bundle update 2022-05-09 21:42:41 +00: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
Github Actions
f5ef01f01e Automatic bundle update 2022-05-08 13:30:05 +00:00
Github Actions
043cd7f5be Automatic bundle update 2022-05-07 04:31:11 +00:00
Github Actions
88821befe6 Automatic bundle update 2022-05-07 00:35:16 +00:00
Anuken
a0ba464de1 Fixed ja/zh unicode nonsense 2021-11-22 12:13:14 -05:00
Anuken
521b0e1ec4 Automatic bundle update 2021-11-22 11:50:28 -05:00
Anuken
c8397c9d10 Reverting bundle update (see description) 
The bundle updater removed quite a lot of comments and extra details. I will be rewriting the bundle launcher to fix this.
 2021-11-22 10:31:01 -05:00
Anuken
d87ee0e942 conflict 2021-11-20 15:06:51 -05:00