mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-28 08:30:03 +07:00
Code Issues Packages Projects Releases Wiki Activity
14,310 Commits 4 Branches 160 Tags 2.3 GiB
fbf70224e4
Commit Graph

14310 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Github Actions
fbf70224e4 Automatic bundle update 2022-05-10 22:58:02 +00:00
Nunting
3db6637e9f
Update bundle_ko.properties (#6763) 
* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

Co-authored-by: Anuken <arnukren@gmail.com>
 2022-05-10 18:56:56 -04:00
Anuken
a089afc626 Merge branch 'master' of https://github.com/Anuken/Mindustry into erekir 
 Conflicts:
	core/assets/bundles/bundle_zh_TW.properties
 2022-05-10 18:15:43 -04:00
Epowerj
6c39249899 Fixed waves on level three not working right with new map changes 2022-05-10 18:14:56 -04:00
Sam Bloom
54daf78cbc
add omega network back (#6810) 2022-05-10 18:12:32 -04:00
Epowerj
b7eeec243e Merge remote-tracking branch 'origin/erekir' into erekir 2022-05-10 17:37:25 -04:00
Epowerj
15fa120eeb Fixed an issue with three 2022-05-10 17:37:19 -04:00
Anuken
01ba06ddef Faster erekir mining speed 2022-05-10 17:35:43 -04:00
Epowerj
1eba814e68 adjusted levels three and four for new tech changes 2022-05-10 16:44:19 -04:00
Anuken
eb8395fa19 Requirement swapbac 2022-05-10 16:25:06 -04:00
Anuken
4ddcd57191 Merge branch 'erekir' of https://github.com/Anuken/Mindustry into erekir 2022-05-10 16:21:24 -04:00
Anuken
cffba7b685 Made useless items/liquids/blocks hidden 2022-05-10 16:21:22 -04:00
dead inside
7683214eff
BuildTurret infinite resources fix (#6808) 
* BuildTurret infinite resources fix

* I'm not a good script kiddie

Too much Testing Utilities has plagued me

* Team infinite resources as well
 2022-05-10 16:04:30 -04:00
Anuken
36513d6ed6 Tech tree restructuring 2022-05-10 16:01:49 -04:00
Anuken
595f3fd117 arc 2022-05-10 13:16:09 -04:00
Anuken
3dd17474c5 Fixed OpenGL vertex arrays / Fixed bullet shrink crop 2022-05-10 13:12:12 -04:00
Anuken
9ac75df34e Merui swap / Bomber command support 2022-05-10 11:13:13 -04:00
Anuken
85d7f2cd62 Bugfixes 2022-05-10 10:17:43 -04:00
Anuken
ca67b0f43c launchCapacityMultiplier per-planet 2022-05-10 00:24:44 -04:00
Anuken
f7e74bdbfc Fixed annotations 2022-05-10 00:14:33 -04:00
Anuken
6efca04ea8 and gone 2022-05-09 23:50:01 -04:00
Anuken
95254eef44 Duct router distribution fixes 2022-05-09 23:11:52 -04:00
Anuken
051a41e86d String overload for mod options 2022-05-09 22:35:58 -04:00
Anuken
83d15ce65e Merge remote-tracking branch 'origin/erekir' into erekir 2022-05-09 20:51:31 -04:00
Anuken
2162770e57 Custom settings categories 2022-05-09 20:51:27 -04:00
xem8k5
db947d33ca
Update bundle_zh_CN.properties twice (#6802) 
* 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-05-09 20:06:23 -04:00
Anuken
aa1abeb4be Typo fixes 2022-05-09 19:55:51 -04:00
Anuken
2b46bbfd2c Merge remote-tracking branch 'origin/erekir' into erekir 2022-05-09 18:24:31 -04:00
Anuken
76f1cfbc07 Actually fixed Serpulo base gen 2022-05-09 18:24:27 -04:00
Github Actions
1a07b1514f Automatic bundle update 2022-05-09 21:42:41 +00:00
Anuken
31c5ef2dc5 Some world processor documentation 2022-05-09 17:41:42 -04:00
Anuken
cf1fb98d5c Misc bugfixes 2022-05-09 17:33:43 -04:00
dead inside
8269d79e56
Liquid Output Display (#6788) 
* Liquid Output Display

* hshfhqwehpvoipwjovpwiqffjvpwqenoij0n89f4v123f2v40q9j8hbnwqvceinopjj90cmqwvinv21904uinfhu0bnv9j90h84g bvb8024q3bh80b3498vcfj932ndjqdjponjewopnviqvnifjwp9ghpnewuubgqjiojpdfoekwdckmpqwpkmidpkewpjndqvjwnfnj8132nt345879ytgh342890yu4598yhubn4t9hrj[tevpkofkwemfvewrphojfekpcfoerkfwmvfh23bng0398g9834ifvrfnwurbgiwnwgherhnwenhgpvrnnivjpjnipfqwjniwqfejnipofvniwejpfqjwociomjefjjmvcmj21m4f98v00ngbhegwefgpjroiewjfqfwpiojnmem

* Pull to separate function

The javadoc description could be different

* In case mods have liquid icons larger than 32x32
 2022-05-09 17:06:55 -04:00
Anuken
94db45f148 Merge branch 'erekir' of https://github.com/Anuken/Mindustry into erekir 2022-05-09 16:55:10 -04:00
Anuken
6cc30e6ebd Fixed tank tread rects 2022-05-09 16:55:08 -04:00
dead inside
2e71c3cf8a
"speed" -> "alpha" (#6801) 2022-05-09 16:52:36 -04:00
Anuken
a82a6f4324 Manual trimming of sprites 2022-05-09 15:14:09 -04:00
Anuken
03a3e43b01 Merge remote-tracking branch 'origin/erekir' into erekir 2022-05-09 15:01:53 -04:00
Anuken
f9be361846 Cropped sprite packing 2022-05-09 15:01:49 -04:00
Epowerj
6e23fffe41 More level 2 tweaks to make it easier 2022-05-09 13:28:27 -04:00
Epowerj
5c6b8df764 Merge remote-tracking branch 'origin/erekir' into erekir 2022-05-09 12:54:28 -04:00
Anuken
0b141b6eb0 more misc bugfixes 2022-05-09 12:51:05 -04:00
Epowerj
1668035759 Tweaked clipping issues in onset 2022-05-09 12:45:48 -04:00
Anuken
4635aad335 Merge branch 'erekir' of https://github.com/Anuken/Mindustry into erekir 2022-05-09 12:21:23 -04:00
Anuken
41413d65b7 Do not allow cross-planet launch pads 2022-05-09 12:21:21 -04:00
Epowerj
79240a45d0 More tweaks to level two - show players they can water cool breach turret 2022-05-09 11:46:11 -04:00
Anuken
f2e5efaea7 Merge remote-tracking branch 'origin/erekir' into erekir 2022-05-09 11:45:05 -04:00
Anuken
3bbb00db9a bugfixes 2022-05-09 11:45:01 -04:00
Epowerj
c5cafd5573 Adjustments to level two to make it easier 2022-05-09 11:39:16 -04:00
Anuken
900e3ec334 bugfixes 2022-05-09 09:49:15 -04:00