mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-20 09:17:19 +07:00
Code Issues Packages Projects Releases Wiki Activity
14,901 Commits 4 Branches 160 Tags 2.3 GiB
65db43268c
Commit Graph

14901 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Github Actions
65db43268c Automatic bundle update 2022-08-03 01:27:29 +00:00
Anuken
b7948852b3 Merge remote-tracking branch 'origin/master' 2022-08-02 21:26:19 -04:00
Anuken
a54907583b Neoplasia reactor 2022-08-02 21:26:15 -04:00
xem8k5
28a280cd38
Update servers_v7.json (#7269) 2022-08-02 20:18:51 -04:00
Anuken
859baec744 Merge remote-tracking branch 'origin/master' 2022-08-02 13:13:42 -04:00
Anuken
e28d7b8d8d Generator explosion system cleanup 2022-08-02 13:13:37 -04:00
Phinner
a4c9d3043d
update (#7270) 2022-08-02 08:11:05 -04:00
Anuken
fa1a5971cf Merge remote-tracking branch 'origin/master' 2022-08-01 20:56:41 -04:00
Anuken
9a95754007 Fixed incorrect scaling with command layout 2022-08-01 20:56:37 -04:00
Github Actions
efb258e9a6 Automatic bundle update 2022-08-02 00:29:14 +00:00
Anuken
d301f6ebe3 Merge remote-tracking branch 'origin/master' 2022-08-01 20:28:12 -04:00
Anuken
2bc000f53c WIP flux reactor 2022-08-01 20:28:07 -04:00
rodas80
fc6dcf96dc
Update servers_v7.json (#7266) 2022-07-31 14:00:19 -04:00
Anuken
df7a0f46b1 Merge remote-tracking branch 'origin/master' 2022-07-31 13:59:36 -04:00
Anuken
36ecb45fb4 Minor UI style tweaks 2022-07-31 13:59:31 -04:00
rodas80
68363b112b
Update servers_v6.json (#7265) 2022-07-31 13:44:49 -04:00
Anuken
3d0a1868c6 Merge remote-tracking branch 'origin/master' 2022-07-31 11:43:26 -04:00
Anuken
427100c61d Fixed commanded unit UI refresh 2022-07-31 11:43:23 -04:00
Joan Josep
d029c85ec5
Add Catalan to available languages and start its localisation. (#7076) 
* Add Catalan to available languages and start its localisation.

* Update bundle_ca.properties

* Update bundle_ca.properties

* Update bundle_ca.properties

* Update Catalan.properties

* Update Catalan.properties

* Update bundle_ca.properties

* Update bundle_ca.properties

* Update bundle_ca.properties

* Update bundle_ca.properties

* Update bundle_ca.properties

* Update bundle_ca.properties

* Update bundle_ca.properties

* Update bundles_ca.properties

* Update bundles_ca.properties

* Update bundle_ca.properties

Co-authored-by: Anuken <arnukren@gmail.com>
 2022-07-31 10:57:00 -04:00
Anuken
765684a9b0 Fixed #7263 2022-07-31 10:55:33 -04:00
Anuken
83ccd0cf48 Merge remote-tracking branch 'origin/master' 2022-07-31 10:38:00 -04:00
Anuken
1fe988adc2 Fixed unit movement overshoot 2022-07-31 10:37:55 -04:00
Nunting
9c276f362d
Update bundle_ko.properties (#7253) 
* Update bundle_ko.properties

* Update bundle_ko.properties
 2022-07-31 00:50:26 -04:00
Anuken
3d64047a91 Fixed Quad Repair AI 2022-07-31 00:30:37 -04:00
Anuken
ce0a8de25b Fixed certain units having useless mine command 2022-07-31 00:16:30 -04:00
Anuken
a87aa75adb More misc cleanup 2022-07-30 23:06:59 -04:00
Anuken
7df2a7ad43 Fixed #7260 2022-07-30 23:03:54 -04:00
Anuken
a0c4ed11c6 Merge remote-tracking branch 'origin/master' 2022-07-30 21:59:40 -04:00
Anuken
0debdee40b Fixed more wide water / Unit command JSON support 2022-07-30 21:59:36 -04:00
Github Actions
cf9a7f0c63 Automatic bundle update 2022-07-31 01:03:28 +00:00
Anuken
5fa301e242 Merge remote-tracking branch 'origin/master' 2022-07-30 21:01:13 -04:00
Anuken
55edd53f84 WIP command order system 2022-07-30 21:01:07 -04:00
Neil2101
83644a4d66
Deleted SubZero (#7258) 
The owners of SubZero focus more on the Minecraft server and the mindustry server will stay offline indefinitely so why not delete it
 2022-07-30 15:22:56 -04:00
Anuken
a326e36bbe Merge remote-tracking branch 'origin/master' 2022-07-30 10:05:06 -04:00
Anuken
b9753204da Fixed #7256 2022-07-30 10:05:01 -04:00
RTOmega
a3bdcd175b
TR Bundle Cleanup (#7229) 2022-07-28 15:38:16 -04:00
Github Actions
b55465a4b0 Automatic bundle update 2022-07-28 14:22:45 +00:00
SoMall-dumpling
a263aa781d
Update bundle_zh_CN.properties (#7189) 
* Update bundle_zh_CN.properties

The following updates will focus on better unit names, turret names, map names, and other untranslated stuff.

* Update bundle_zh_CN.properties

four new lines

* Update bundle_zh_CN.properties

Revert rollback, and some missing translations.

* Update bundle_zh_CN.properties

map names

* Update bundle_zh_CN.properties

turret names, arkycite-related translations

* Update bundle_zh_CN.properties

boulders

* 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

这个\n的位置我实在看不下去了

* Create bundle_zh_CN.properties

恶灵->魔灵

* Update bundle_zh_CN.properties

奇奇怪怪多出来个\n

* 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

two new lines

* Update bundle_zh_CN.properties

还是改回来。事实上墙的描述是挡下敌方炮弹，但也挡不住抛射炮。所以没有太大必要改前面的东西。（而且shell也是炮弹的意思）
死神，太逊啦

* 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-28 10:21:38 -04:00
xStaBUx
0cd80b70b7
Water in cryofluid mixer & cultivator (#7244) 
* criofluid mixer, cultivator & spore press liquids fix

water and oil now displayed in cryofluid mixer, cultivator and spore press

* 1

* 2
 2022-07-28 09:43:52 -04:00
BlackDeluxeCat
df1df66c6c
Update FilterOption.java (#7248) 2022-07-28 09:42:52 -04:00
RlCCJ
311cd86e47
Why is it here? (#7240) 
BlockProducer already has buildSpeed.
 2022-07-28 09:42:33 -04:00
WayZer
0054fcc428
Update servers_v7.json (#7242) 2022-07-28 09:42:16 -04:00
BalaM314
d18579b59a
Allow printflushing to null (#7243) 
* Allow `printflush`ing to null

* Dumb
 2022-07-28 09:41:31 -04:00
hortiSquash
02c4e905a5
More Optimized Unloaders (Serpulo) (#7249) 
* Update Unloader.java

* some comments

* deleted highUnloadPriority
 2022-07-28 09:41:11 -04:00
Catchears
224cc80b59
update heat source description to match other sources (#7230) 
* update heat source description to match other sources

* correct to large amounts of heat
 2022-07-28 09:39:30 -04:00
Anuken
c1971cb5b1 Fixed #7241 2022-07-28 09:30:19 -04:00
Anuken
5fb7c2a916 Fixed #7239 2022-07-28 09:26:28 -04:00
Anuken
fa3bd6dbc6 Fixed #7227 2022-07-23 13:15:54 -04:00
Anuken
ca04c85b92 Merge branch 'master' of https://github.com/Anuken/Mindustry 2022-07-23 13:09:17 -04:00
Anuken
50530e7534 Improved drillable stat display 2022-07-23 13:08:51 -04:00