Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,595 Commits 4 Branches 180 Tags
f74293b878b2392513fc90474125712e3273dee6
Commit Graph
14011 Commits
Author SHA1 Message Date
Anuken 211c0b2e71 Sublimate visuals, damage/length still broken 2021-11-24 12:30:01 -05:00
Anuken ba14151a01 A significant waste of time and effort 2021-11-23 22:41:25 -05:00
Anuken 4d49b0b2ee Visual tweaks 2021-11-22 23:02:35 -05:00
Anuken 3a9fdc8b3d Phase synthesizer implementation 2021-11-22 22:34:22 -05:00
Anuken 947864269b Slag-based incinerator 2021-11-22 14:48:26 -05:00
Anuken d218480f6f Turret requirement cleanup / WIP ContinuousTurret type 2021-11-22 13:59:09 -05:00
Anuken f7cf35369b Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/assets/bundles/bundle_zh_CN.properties
	core/assets/bundles/bundle_zh_TW.properties
 2021-11-22 13:17:36 -05:00
Build Uploader 42d931bff4 Automatic bundle update 2021-11-22 18:10:50 +00:00
Darkness#3729andGitHub 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 521b0e1ec4 Automatic bundle update 2021-11-22 11:50:28 -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
MrDuck557GitHubLele567
 		25f98fdeb0 engineColor (#6360) 
Co-authored-by: Lele567 <48808663+Lele567@users.noreply.github.com>
 2021-11-22 10:11:03 -05:00
MrDuck557GitHubLele567
 		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
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
LinandGitHub 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
Prosta4okuaandGitHub 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 7d849b7ea0 I have spent far too much time redrawing this stupid sprite 2021-11-19 20:32:09 -05:00
Anuken f3ace3a526 low effort large plasma bore 2021-11-18 16:22:53 -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
hortiSquashGitHubcitrusMarmelade
 		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 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
Anuken 8d05b878d7 oxidation chamber implementation 2021-11-16 14:54:23 -05:00
Anuken 67f8cffca0 Liquid total bugfixes 2021-11-16 11:02:42 -05:00
Anuken eefcce5cf1 Better multi-liquid support / Reinforced pump progress 2021-11-16 10:25:59 -05:00
Anuken bf1909295e Electrolyzer finalization 2021-11-15 15:17:20 -05:00
Anuken 9663d1153f WIP electrolyzer + liquid fixes 2021-11-15 14:31:52 -05:00
Matthew PengandGitHub 4a7774fe5a Dynamic resupply check (#6338) 2021-11-15 09:27:22 -05:00
Anuken 7103de8454 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-11-15 08:24:55 -05:00
Anuken d23813f328 Merge remote-tracking branch 'origin/master' 2021-11-15 08:24:47 -05:00