Mirrors/mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-09-22 13:01:12 +03:00
Code Issues Packages Projects Releases Wiki Activity
21,707 Commits 8 Branches 203 Tags
9aca7ec86d4ee528f8a3c09477aa2e667c195368
Commit Graph

105 Commits

Author SHA1 Message Date
Anuken
867dd29ba8 Merge branch 'master' of https://github.com/Anuken/Mindustry into v9 
# Conflicts:
#	core/assets/bundles/bundle_es.properties
#	core/assets/bundles/bundle_it.properties
#	core/src/mindustry/game/MapObjectives.java
#	core/src/mindustry/logic/LExecutor.java
#	core/src/mindustry/world/blocks/payloads/PayloadMassDriver.java
#	gradle.properties
#	tests/src/test/java/ApplicationTests.java
 2026-09-09 17:51:03 -04:00
Github Actions
06dd6d98b2 Automatic class mapping and map name update 2026-08-30 20:14:59 +00:00
Anuken
22f0b9a5c7 Merge branch 'master' of https://github.com/Anuken/Mindustry into v9 
# Conflicts:
#	core/src/mindustry/logic/LExecutor.java
#	core/src/mindustry/world/blocks/logic/LogicDisplay.java
#	core/src/mindustry/world/meta/StatValues.java
#	gradle.properties
 2026-08-29 09:53:28 -04:00
Github Actions
dc32943612 Automatic class mapping and map name update 2026-08-27 16:46:49 +00:00
Github Actions
1befd890cc Automatic class mapping and map name update 2026-08-14 16:24:02 +00:00
Anuken
e26205a4f7 Merge remote-tracking branch 'origin/master' into v9 
# Conflicts:
#	core/assets/bundles/bundle_ca.properties
#	core/assets/scripts/global.js
#	core/src/mindustry/mod/DataImagePacker.java
#	gradle.properties
#	tools/src/mindustry/tools/SchemaGenerator.java
 2026-08-14 12:20:03 -04:00
Github Actions
313e80448a Automatic class mapping and map name update 2026-08-13 15:31:57 +00:00
Anuken
43d3aa6460 Fixed layout issues with outdated servers / .d.ts generation script 2026-08-12 14:11:59 -04:00
Anuken
87b1bc1ad6 Merge branch 'master' of https://github.com/Anuken/Mindustry into v9 
# Conflicts:
#	core/src/mindustry/mod/DataImagePacker.java
#	gradle.properties
 2026-08-04 21:46:46 -04:00
Anuken
2fd3ae7d88 Scripts updated 2026-08-03 17:11:25 -04:00
Anuken
7241bdece6 Import fixes for v9 2026-07-12 11:45:03 -04:00
Anuken
dc5e877af6 Merge branch 'master' of https://github.com/Anuken/Mindustry into v9 2026-07-12 11:42:50 -04:00
Anuken
0b3300397b JS import tweaks 2026-07-12 11:41:56 -04:00
Github Actions
8d5e02dfbe Automatic class mapping and map name update 2026-07-05 18:06:58 +00:00
Github Actions
5ddbc7d25e Automatic class mapping update 2026-06-12 23:13:19 +00:00
Anuken
178cd16010 Optimizations that don't even belong in this branch 2026-06-08 23:47:46 -04:00
Anuken
1ed80c59fd Embed assets when exporting save 2026-06-01 12:14:53 -04:00
Anuken
e11ada7ef2 Rule/planet/server/logic music playing support 2026-05-30 12:46:28 -04:00
Github Actions
fe487fbbcf Automatic class mapping update 2026-04-30 01:45:47 +00:00
Github Actions
ef975835cf Automatic class mapping update 2026-04-05 03:03:08 +00:00
Anuken
7130b6155c Fixed #11395 2025-11-30 11:04:47 -05:00
Anuken
1b6c0c7717 Minor bugfixes + ClassMap update 2025-04-13 10:05:57 -04:00
Anuken
bba41efb28 More JS package conflict fixes 2024-10-21 12:23:26 -04:00
Anuken
3b8fdeef13 Removed flabel import due to ambiguous import 2024-10-20 00:25:26 -04:00
Anuken
ef33a05cb8 Cleanup (2) 2024-10-06 21:18:01 -04:00
Anuken
846e313c2f Cleanup 2024-10-06 21:11:05 -04:00
Anuken
785a081788 Fixed ScriptMainGenerator class lookup 2024-10-06 21:06:58 -04:00
Anuken
97390d25c0 Removed pointless code 2023-04-05 19:51:16 -04:00
Anuken
1075e4b1b7 Mod subtitles 2022-04-27 23:14:14 -04:00
Anuken
b40957e28b Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/ui/dialogs/JoinDialog.java
 2022-04-20 14:16:20 -04:00
Anuken
5721cc75b6 Mod load fixes 2022-04-18 17:22:47 -04:00
Anuken
b5b4edcb67 Misc polish stuff 2022-04-17 17:12:01 -04:00
smol
9be95020f2 flabel (#6698) 2022-04-06 00:03:16 -04:00
Anuken
c3e9a961c5 New weapon pattern system 2022-02-24 20:06:52 -05:00
Anuken
c324f2124b DEATH AND DESTRUCTION 2022-02-15 16:46:32 -05:00
Anuken
fa6ddd5f50 Conquer tank progress 2022-02-03 15:13:08 -05:00
Anuken
de96c8201d Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2022-02-03 12:48:31 -05:00
Anuken
eb4d2fc3a3 Weapons parts for units / No logic on Erekir 2022-02-02 20:39:22 -05:00
smol
29311806a9 PlayerConnectionConfirmed (#6539) 
* PlayerConnectionConfirmed

* AdminRequestEvent
 2022-01-29 11:34:34 -05:00
GlennFolker
758921c077 Added 2 versatile trigger event types (#6130) 
* t

* oops
 2021-10-10 08:08:04 -04:00
Anuken
00a2c1aad0 Refactored fireball into FireBulletType 2021-08-08 13:37:55 -04:00
Anuken
00e3a59463 Land animation progress / IntelliJ android plugin hack 2021-07-27 16:26:13 -04:00
Anuken
bc7085826e Re-generated ClassMap 2021-07-01 11:44:29 -04:00
Anuken
28b235ef07 Partial 7.0 merge - API preview 2021-06-02 11:08:08 -04:00
Anuken
56e41309b1 Updated global script 2021-02-13 11:56:40 -05:00
Anuken
e3f388692f Misc cleanup & fixes 2021-01-19 15:13:41 -05:00
DeltaNedas
ffa7256e5a add ContentInitEvent (#3951) 
* add ContentInit(ialized)Event

* a

* a
 2020-12-13 23:43:27 -05:00
Charlotte Lily-Llaitchee Vixen
409d27e3df found more occurances of the error 2020-12-12 07:23:23 +00:00
Charlotte Lily-Llaitchee Vixen
d47abd4f83 fixed an error in global.js 2020-12-12 07:15:24 +00:00
Anuken
e4266d22f5 Added more hints 2020-11-21 17:17:03 -05:00