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
15,019 Commits 4 Branches 160 Tags 2.3 GiB
c97a6b2f39
Commit Graph

15019 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
RlCCJ
4ba91b56b5
Restrict the ipt (#7226) 2022-07-23 13:04:17 -04:00
Anuken
d98f26d35b Erekir unit logic ID order changed 2022-07-22 14:10:46 -04:00
Anuken
0e81d19bd4 Merge remote-tracking branch 'origin/master' 2022-07-22 14:06:40 -04:00
Anuken
8eabe419c5 Heat source warmup fix 2022-07-22 14:06:34 -04:00
Github Actions
43f7384855 Automatic bundle update 2022-07-22 18:00:35 +00:00
RTOmega
9a3a6c31b3
Adding Block: Heat Source (#6855) 
* Update Blocks.java

* ,

* Update Blocks.java

* Add files via upload

* Delete 5618F7BA-F0D0-4FFF-AE6A-185BFEA99F16.png

* Add files via upload

* Add files via upload

* Add files via upload

* Update Blocks.java

* Bundle

* 1m to 10k

* Update bundle.properties

* TR

* 10k to 1k

Co-authored-by: Anuken <arnukren@gmail.com>
 2022-07-22 13:59:32 -04:00
rly4498
f16894592f
onShoot on StatusFieldAbility (#7221) 
* onShoot on StatusFieldAbility

allows for more JSON gaming

* hmm
 2022-07-22 13:43:37 -04:00
Anuken
b150bcfb10 Merge remote-tracking branch 'origin/master' 2022-07-22 13:04:35 -04:00
Anuken
00d86e81a4 completely unfinished class that I might finish later 2022-07-22 13:04:31 -04:00
KotMilkMeoWtwo
6311dab533
Rename server (#7225) 
* Rename server

* Update servers_v7.json
 2022-07-22 10:33:44 -04:00
Anuken
3b0729b64e Fixed #7222 2022-07-22 04:48:02 -04:00
Anuken
687d0b4f00 Misc minor bugfixes 
at 4 AM
 2022-07-22 03:51:24 -04:00
Anuken
5ae204dd22 Fixed #7218 2022-07-21 21:23:02 -04:00
Anuken
da1103a2c0 Merge remote-tracking branch 'origin/master' 2022-07-21 07:56:13 -04:00
Anuken
1476c4dacd Fixed #7213 2022-07-21 07:56:09 -04:00
Anuken
56a798463a
Update servers_v7.json 
Removed outdated server
 2022-07-20 17:29:49 -04:00
BeDanGames
dfc9daf26e
Update servers_v7.json (#7211) 2022-07-20 15:59:18 -04:00
Anuken
5f4f07a10a Merge remote-tracking branch 'origin/master' 2022-07-20 15:58:29 -04:00
Anuken
25a1d125c8 Fixed #7207 2022-07-20 15:58:24 -04:00
BeDanGames
3d84ef9a21
Update servers_v7.json (#7205) 2022-07-19 21:59:26 -04:00
Anuken
1a39bcaef0 Smaller vanilla env page size 2022-07-19 20:43:10 -04:00
Anuken
4fbad2356d Mobile boosting unit fix 2022-07-19 11:34:44 -04:00
Anuken
90e9d37a9a Fixed #7201 2022-07-19 10:59:07 -04:00
Anuken
f1dc769b1f Fixed #7195 2022-07-19 07:42:58 -04:00
Anuken
e0f874c46f Merge remote-tracking branch 'origin/master' 2022-07-19 07:38:39 -04:00
Anuken
606cdff17d Fixed #7198 2022-07-19 07:38:34 -04:00
Github Actions
b94393f150 Automatic bundle update 2022-07-19 02:16:10 +00:00
Anuken
1c2aca91e4 Merge remote-tracking branch 'origin/master' 2022-07-18 22:14:57 -04:00
Anuken
a6ae178b46 Misc minor fixes 2022-07-18 22:14:53 -04:00
Epowerj
2332d9bee1 Tweaked intersect 2022-07-18 13:41:04 -04:00
Epowerj
a36a87fa83 Added an extra island to lake 2022-07-18 13:37:18 -04:00
Epowerj
1529d4ecc9 Tweaked aegis 2022-07-18 11:22:26 -04:00