mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-25 22:17:59 +07:00
Code Issues Packages Projects Releases Wiki Activity
14,423 Commits 4 Branches 160 Tags 2.3 GiB
91643d94c4
Commit Graph

12176 Commits

Author SHA1 Message Date
Anuken
d1c1455565 Don't sense hidden items/liquids 2022-05-12 00:38:32 -04:00
Anuken
e83e402612 Merge branch 'erekir' of https://github.com/Anuken/Mindustry 2022-05-12 00:19:14 -04:00
Github Actions
48b19751a3 Automatic bundle update 2022-05-12 04:07:42 +00:00
Anuken
9b9a1dd332 Merge branch 'erekir' of https://github.com/Anuken/Mindustry 2022-05-12 00:06:55 -04:00
xem8k5
699a8929e4
Fix bundle_zh_CN.properties (#6844) 
* Fix bundle_zh_CN.properties

block.tank-refabricator.name = 坦克重构厂
block.mech-refabricator.name = 爬虫重构厂
block.ship-refabricator.name = 飞艇重构厂

Now is "refabricator"？

* Update bundle_zh_CN.properties
 2022-05-12 00:06:47 -04:00
Anuken
9edab6e742 Merge remote-tracking branch 'origin/master' 2022-05-11 23:28:41 -04:00
Anuken
263f129c8b Fixed #6843 2022-05-11 23:28:37 -04:00
hortiSquash
7914a187e5
Unloader fix 4 - New Load Priority (#6840) 
* should solve the MD bug and some others

* skill issue
 2022-05-11 22:39:50 -04:00
Anuken
6e79f22734 Merge remote-tracking branch 'origin/master' 2022-05-11 22:20:17 -04:00
Anuken
eae371854b Zenith item capacity revert (for now) 2022-05-11 22:20:13 -04:00
Somka000
1944ffe1a5
Translated everything bundle_pl.properties (#6838) 2022-05-11 21:57:26 -04:00
Anuken
ac4d5b66b3 Enabled gl30 by default, will likely crash on certain devices... 2022-05-11 21:38:30 -04:00
Anuken
de909b2ad3 Merge remote-tracking branch 'origin/master' 2022-05-11 20:18:29 -04:00
Anuken
d4b0c9da1b Hide command mode popup on mobile 2022-05-11 20:18:25 -04:00
Rex
19d5170137
Update contributors (#6836) 2022-05-11 20:13:47 -04:00
Github Actions
eff4e91207 Automatic bundle update 2022-05-11 23:28:53 +00:00
xem8k5
37a46282f2
Update bundle_zh_CN.properties the third time (#6834) 
* Update bundle_zh_CN.properties the third time

Fixed various grammar issues

* Update bundle_zh_CN.properties
 2022-05-11 19:27:58 -04:00
buthed010203
d4681f2c94
No. (#6833) 2022-05-11 19:27:47 -04:00
Anuken
650b67365b Fixed #6829 2022-05-11 16:58:18 -04:00
Anuken
c1e98a1406 Merge branch 'erekir' of https://github.com/Anuken/Mindustry 2022-05-11 14:40:39 -04:00
Anuken
3554d64573 Merge branch 'master' of https://github.com/Anuken/Mindustry 2022-05-11 14:36:36 -04:00
Anuken
be9b7da892 Automatic consumeCoolant 2022-05-11 14:36:34 -04:00
JniTrRny
849d0b6223
newline for those unfortunate mobile players (#6828) 2022-05-11 14:28:04 -04:00
Rex
2da60c4efc
Update bundle_es.properties (#6826) 
I just realized that they are turrets and not blocks
 2022-05-11 14:04:32 -04:00
dead inside
4d12ac8ed6
A better way to do this (#6827) 2022-05-11 14:01:10 -04:00
Anuken
f54116425d Bugfixes 2022-05-11 12:33:10 -04:00
Anuken
25cc53625c Merge remote-tracking branch 'origin/master' 2022-05-11 12:02:25 -04:00
Anuken
2beca30b0c Spore press craft time fix 2022-05-11 12:02:19 -04:00
Github Actions
4ac87ec61a Automatic bundle update 2022-05-11 14:15:24 +00:00
Rex
beae0662ce
Update bundle_es.properties (#6825) 2022-05-11 10:14:12 -04:00
snusunny
72f4d67a3b
[KO] Fix incorrect translations (#6823) 
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- Fixed condensers being translated into *electric* condensers
- Fixed incorrect core names
- Made team names (derelict, sharded, crux ectc.) be proper nouns (고유명사) like you asked
- Fixed blast doors being translated as blast *compound* doors
- some other small fixes
 2022-05-11 10:02:00 -04:00
Anuken
60cb4a2a73 Merge remote-tracking branch 'origin/master' 2022-05-11 09:42:21 -04:00
Anuken
35f07150f2 aaa 2022-05-11 09:42:17 -04:00
Lucky Clover
c9ee471b34
Fix show wrong output liquid icon (#6819) 
Fix show output liquid icon if rotate non-specified output liquids factory like melter.
 2022-05-11 09:41:53 -04:00
Anuken
debf940973 Fixed preview render crash 2022-05-11 09:39:43 -04:00
Anuken
9b33ab3c0a Fixed #6815 2022-05-11 00:44:15 -04:00
Anuken
24a6ef2bc3 Correct team usage 2022-05-10 23:13:59 -04:00
Anuken
afe02bf3a0 Misc fixes 2022-05-10 22:55:28 -04:00
Anuken
aa3bf50731 Merge remote-tracking branch 'origin/master' 2022-05-10 21:56:41 -04:00
Anuken
8c98f8f9bf Mass driver reloadTime -> reload 2022-05-10 21:56:34 -04:00
Somka000
64e5561b5a
Translate things from Erekir and some other (#6812) 2022-05-10 21:16:32 -04:00
Anuken
2e4037451f Merge branch 'erekir' of https://github.com/Anuken/Mindustry 2022-05-10 21:07:48 -04:00
Yuri Polyakov
99f98cc761
Update bundle_ru.properties (#6760) 
* Update bundle_ru.properties

* Update bundle_ru.properties

упс

Co-authored-by: Anuken <arnukren@gmail.com>
 2022-05-10 21:07:33 -04:00
Yuri Polyakov
05cbc8a477
Update bundle_ru.properties (#6762) 
* Update bundle_ru.properties

* Update bundle_ru.properties
 2022-05-10 21:07:13 -04:00
Anuken
e15ed4403c Unignore icons.properties 2022-05-10 20:38:05 -04:00
Anuken
60d3a51ebc What a horrible waste of time 2022-05-10 20:08:48 -04:00
Anuken
8f31faa98e Merge remote-tracking branch 'origin/master' 2022-05-10 19:19:38 -04:00
Anuken
6a129371d2 Fixed #6811 2022-05-10 19:19:21 -04:00
Github Actions
05578fe8b7 Automatic bundle update 2022-05-10 23:02:41 +00:00
Anuken
6bda5546a6 Merge branch 'erekir' of https://github.com/Anuken/Mindustry 2022-05-10 19:01:40 -04:00
Anuken
0c6c9620a7 lang 2022-05-10 19:01:33 -04:00
end-me-please
9b8a09892a
Update bundle_de.properties (#6768) 
aHR0cHM6Ly9pLmltZ3VyLmNvbS9NSG1kV0plLnBuZw==
 2022-05-10 18:58:36 -04:00
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
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
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
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
Anuken
a8a8cc950e ok ilya 2022-05-09 04:51:44 -04:00