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
13,175 Commits 4 Branches 160 Tags 2.3 GiB
0b7d8f371e
Commit Graph

13175 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Build Uploader
42d931bff4 Automatic bundle update 2021-11-22 18:10:50 +00:00
Darkness#3729
4eb4c84b64
[RU] Update bundle (#6355) 
**Ban**dle
 2021-11-22 13:09:35 -05:00
Anuken
a0ba464de1 Fixed ja/zh unicode nonsense 2021-11-22 12:13:14 -05:00
Anuken
a48911b983 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/assets/bundles/bundle_ko.properties
	core/assets/bundles/bundle_zh_CN.properties
	core/assets/bundles/bundle_zh_TW.properties
 2021-11-22 12:11:31 -05:00
Anuken
cec39f8a70 Merge remote-tracking branch 'origin/master' 2021-11-22 12:08:14 -05:00
Anuken
64b4478bac Better bundle updater output 2021-11-22 12:08:10 -05:00
rodas80
8c9de7e4eb
Update servers_v6.json (#6352) 2021-11-22 12:06:05 -05:00
Anuken
2d5e9118a5 I do not know bash 2021-11-22 12:04:51 -05:00
Anuken
261ad5dae5 BundleLauncher moved to gradle script 2021-11-22 12:04:09 -05:00
Anuken
e0b14db778 Added bundle updates as part of commit 2021-11-22 11:52:08 -05:00
Anuken
521b0e1ec4 Automatic bundle update 2021-11-22 11:50:28 -05:00
Anuken
d550ad5614 no 2021-11-22 11:44:28 -05:00
Anuken
8717fd8b33 Better bundle updater implementation 2021-11-22 11:43:13 -05:00
Anuken
ef1084302f Merge remote-tracking branch 'origin/master' 2021-11-22 10:31:10 -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
65f36faf71 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/assets/bundles/bundle_ko.properties
	core/src/mindustry/type/UnitType.java
 2021-11-22 10:12:48 -05:00
MrDuck557
25f98fdeb0
engineColor (#6360) 
Co-authored-by: Lele567 <48808663+Lele567@users.noreply.github.com>
 2021-11-22 10:11:03 -05:00
MrDuck557
f1e9d05163
blinkSize (#6359) 
Co-authored-by: Lele567 <48808663+Lele567@users.noreply.github.com>
 2021-11-22 10:08:57 -05:00
Anuken
6edf0a27a4 Fixed building relative rotations 2021-11-21 22:03:15 -05:00
Anuken
64efa599d0 Slag heater block 2021-11-21 14:06:18 -05:00
Anuken
0014c7a525 Slag centrifuge implementation 2021-11-21 11:59:35 -05:00
Valeriy
f81d519c91
Add to v7 (#6357) 2021-11-21 10:38:06 -05:00
Valeriy
5a03083b57
Removing from v6 (#6356) 2021-11-21 10:37:58 -05:00
Anuken
4fcd873f65 Gallium 2021-11-20 17:59:24 -05:00
Anuken
77fb5a9a24 conflict 2021-11-20 15:07:07 -05:00
Anuken
d87ee0e942 conflict 2021-11-20 15:06:51 -05:00
Anuken
0dc8c6cd25 Updated bundles 2021-11-20 15:06:14 -05:00
Lin
aeaba6e111
Update bundle_zh_CN.properties (#6300) 
* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties
 2021-11-20 15:05:55 -05:00
Prosta4okua
0e8a677ecc
Update bundle_uk_UA.properties (#6290) 
* Update bundle_uk_UA.properties

Атака -> Наступ

* Update bundle_uk_UA.properties

конструкції->споруди

* Update bundle_uk_UA.properties

* Приголомшлює -> електризує

* Small fixes

→ -> "->"
елемент -> предмет
Оксино -> Оксиноя, better spelling

* Update bundle_uk_UA.properties
 2021-11-20 15:05:46 -05:00
Anuken
b4cd21752c Merge remote-tracking branch 'origin/master' 2021-11-20 10:58:12 -05:00
Anuken
d1a5198efc Fixed #6351 2021-11-20 10:58:07 -05:00
Anuken
f4c54b20f7 h 2021-11-20 10:56:21 -05:00
Anuken
7690f12682 What the hell is going on with jitpack 2021-11-20 10:32:28 -05:00
Anuken
a39d156d12 Optional beam drill liquid input / Fixed graphite color 2021-11-20 10:15:55 -05:00
Anuken
0d197fa00c I have spent far too much time redrawing this stupid sprite 2021-11-19 21:56:02 -05:00
Anuken
7d849b7ea0 I have spent far too much time redrawing this stupid sprite 2021-11-19 20:32:09 -05:00
devlaq
731fd2900a
Update servers_v6.json (#6348) 2021-11-18 18:28:52 -05:00
Anuken
f3ace3a526 low effort large plasma bore 2021-11-18 16:22:53 -05:00
Anuken
7a73b3bc7a arc 2021-11-18 15:34:07 -05:00
Anuken
275f6eb32f Overflow duct 2021-11-18 14:47:33 -05:00
Anuken
6026beb397 Emanate impl / Rotation lock 2021-11-17 18:02:19 -05:00
Anuken
4d13b8df7a Surge crucible effects 2021-11-17 13:37:51 -05:00
Anuken
4567ee9a13 Test fixes / Building module presence saving 2021-11-17 10:58:36 -05:00
Anuken
29f8ebddb9 Sprite tweaks 2021-11-17 09:42:33 -05:00
Anuken
51626b6233
spelling 2021-11-17 09:41:18 -05:00
hortiSquash
fd1678dbc9
Unloading into plast belts - bug fix (#6347) 
* hortiloaders hotfix randomness

Improved the unloaders' balance with multiple blocks having the same load

* deterministic lets go

Co-Authored-By: citrusMarmelade <20476281+citrusMarmelade@users.noreply.github.com>

* update contributors

forgot to add them since they helped a lot for the previous commits/PRs

* unloader - fix cant load

Co-authored-by: citrusMarmelade <20476281+citrusMarmelade@users.noreply.github.com>
 2021-11-17 09:35:36 -05:00
Anuken
f87cd9c643
Do not make formatting PRs. 2021-11-16 23:36:13 -05:00
Anuken
7798bb6702 Fixed packing issues 2021-11-16 23:10:49 -05:00
Anuken
82eb3a9159 Alloy smelter rename / WIP block ideas 2021-11-16 22:37:13 -05:00
Anuken
25f44f86f8 Making DrawBlock more generic 2021-11-16 19:55:13 -05:00