Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,090 Commits 4 Branches 180 Tags
78590abfc0fca83f64b9de227e2cfdc33fe1ec9b
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken 78590abfc0 reinforced vault/container 2021-11-24 18:28:50 -05:00
Anuken b7ac1e1d74 Stuff. 2021-11-24 13:33:01 -05:00
Anuken 3512190373 sublimate progress 2021-11-24 12:50:43 -05:00
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 d7adacd932 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-11-22 15:37:16 -05:00
Anuken 41e82881f3 Gradle 7.3 2021-11-22 15:32:00 -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
Anuken 55219ea141 Merge remote-tracking branch 'origin/master' 2021-11-22 13:16:05 -05:00
Anuken b0c46d3c97 Removed BindingsGenerator, FontGenerator 2021-11-22 13:16:00 -05:00
AnukenandGitHub fa2efcbe15 Update push.yml 2021-11-22 13:12:14 -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
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
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
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
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
AnukenandGitHub 51626b6233 spelling 2021-11-17 09:41:18 -05:00
AnukenandGitHub 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
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
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
Anuken f586fd285c Fixed #6341 2021-11-15 08:24:39 -05:00
Anuken b99e18478f tweaks 2021-11-15 08:24:16 -05:00
Anuken 7acf53c509 multi-liquids consumers 2021-11-14 23:30:58 -05:00
Anuken 486622e3e4 Many crazy things 2021-11-14 23:10:15 -05:00
Anuken 70cf55f314 More slag 2021-11-14 10:12:47 -05:00
Anuken 3a6878ef60 T2 reinforced core unit 2021-11-13 10:40:55 -05:00
Anuken 2f0daa6fc4 Core cleanup / Turret draw class 2021-11-12 20:09:27 -05:00
Anuken 757977b7b9 Misc tweaks 2021-11-12 13:47:22 -05:00
Anuken 8da4e72e77 carbide crucible implementation 2021-11-12 11:07:15 -05:00
Anuken 51301a50cc HeatCrafter 2021-11-11 20:39:43 -05:00
Anuken a1107eae13 WIP heat reactor system 2021-11-11 18:52:51 -05:00
Anuken f3b2e4498d Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	gradle.properties
 2021-11-10 14:36:45 -05:00
Anuken c87bc11ad2 Core: Acropolis 2021-11-10 09:38:18 -05:00
Anuken da87726176 Core: Citadel 2021-11-09 20:20:44 -05:00
Anuken 501a65e9a3 reorganization 2021-11-09 12:57:14 -05:00
Anuken 34e74834fd Arc furnace recipe fix 2021-11-09 12:49:25 -05:00
Anuken 73f3fe31da Aegis core 2021-11-09 10:41:42 -05:00
Anuken 1f98383535 EEEEEEEEEEEEEENERGYYYYYYYYYY 2021-11-08 22:21:04 -05:00
Anuken 5f3b3ea559 H 2021-11-08 16:11:55 -05:00
Anuken 8964caf2aa Conduit bridge fixes 2021-11-08 16:09:43 -05:00
Anuken dffe90acff Directional liquid bridge 2021-11-08 12:06:55 -05:00
Anuken ce0e26f008 New liquid tanks/routers/contaienrs 2021-11-08 09:47:00 -05:00
Anuken af7c11c4b7 Merge remote-tracking branch 'origin/master' 2021-11-08 08:56:32 -05:00
Anuken 656bb34b68 Fixed #6314 2021-11-08 08:56:26 -05:00
Anuken d72de24942 WIP liquid blocks 2021-11-08 08:56:12 -05:00
Anuken 07d9feeb09 WIP reinforced conduits 2021-11-07 12:56:58 -05:00
Anuken 09a934385e "stuff" 2021-11-06 22:21:46 -04:00
Anuken da49328412 Stack router + Consistent item source + Item void flow 2021-11-06 16:31:42 -04:00
Anuken ed302d978c sprites 2021-11-05 19:50:47 -04:00
Anuken 059dc4b3bc Directional duct unloader 2021-11-05 19:45:27 -04:00
Anuken 52a88e7301 removed unused sprites 2021-11-05 16:41:27 -04:00
Anuken 6b3dfa6036 Carbide, surge conveyors 2021-11-05 16:41:08 -04:00
Anuken 24ca434bae Take into account string length in client snapshots 2021-11-05 08:51:59 -04:00
Anuken 57ef7c823e WIP carbide 2021-11-05 08:47:05 -04:00
Anuken 189604474c These things exist now 2021-11-04 22:34:42 -04:00
Anuken 5fe8ed88a6 Fixed #6305 2021-11-04 22:30:19 -04:00
Anuken b553f5afc2 Merge remote-tracking branch 'origin/master' 2021-11-04 22:23:36 -04:00
Anuken 5e534822b8 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/type/UnitType.java
	gradle.properties
 2021-11-04 19:39:16 -04:00
Anuken 9e68b0a72b Fixed #6304 2021-11-04 19:34:28 -04:00