Mirrors/mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-10-02 03:00:29 +03:00
Code Issues Packages Projects Releases Wiki Activity
21,717 Commits 7 Branches 203 Tags
0dffe0ee2b605e8adde0ca1601af699674278189
Commit Graph
552 Commits
Author SHA1 Message Date
Github Actions 0dffe0ee2b Automatic bundle update 2026-09-21 05:58:47 +00:00
Github Actions cf2f3f82b5 Automatic bundle update 2026-09-12 14:54:29 +00:00
Anuken b7f1681157 Merge branch 'master' of https://github.com/Anuken/Mindustry into v9 
# Conflicts:
#	gradle.properties
 2026-09-11 12:58:55 -04:00
Github Actions b430eaa239 Automatic bundle update 2026-09-11 00:01:29 +00:00
Github Actions 2af44b5f5e Automatic bundle update 2026-09-10 23:52:49 +00:00
Github Actions 7c5f29e6fb Automatic bundle update 2026-09-10 15:45:35 +00:00
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 64bc6d3ac0 Automatic bundle update 2026-09-09 16:47:29 +00:00
Anuken 2276f471f2 Merge branch 'logic-editor-autowrap' 
# Conflicts:
#	core/src/mindustry/logic/LStatements.java
 2026-09-09 12:45:27 -04:00
Anuken 2837f2cad2 More layout fixes 2026-09-09 12:43:04 -04:00
Github Actions 200f4d42be Automatic bundle update 2026-09-08 06:42:43 +00:00
Github Actions ec4fe559f5 Automatic bundle update 2026-09-05 20:04:57 +00:00
Github Actions 83dd62f2ad Automatic bundle update 2026-09-05 13:52:41 +00:00
Github Actions a8b1dda1a1 Automatic bundle update 2026-09-03 14:05:58 +00:00
Github Actions b515773fbf Automatic bundle update 2026-09-03 14:03:13 +00:00
Github Actions 33bc4c9e6f Automatic bundle update 2026-09-03 01:40:21 +00:00
Github Actions fa59008448 Automatic bundle update 2026-09-02 21:02:23 +00:00
Github Actions 553c2beeea Automatic bundle update 2026-09-02 20:32:14 +00:00
Github Actions 5720f8b9b6 Automatic bundle update 2026-09-01 23:54:40 +00:00
Github Actions 2504e6a93c Automatic bundle update 2026-09-01 20:50:26 +00:00
Github Actions 7f009df50f Automatic bundle update 2026-09-01 02:14:53 +00:00
Github Actions b4cd02137d Automatic bundle update 2026-09-01 02:03:49 +00:00
Github Actions cf4a69cb33 Automatic bundle update 2026-08-30 19:39:53 +00:00
Github Actions 66d80f8b8c Automatic bundle update 2026-08-30 19:27:37 +00:00
Github Actions 124640e23a Automatic bundle update 2026-08-30 19:24:25 +00:00
Github Actions b452ac48f7 Automatic bundle update 2026-08-29 22:04:58 +00:00
Github Actions 460debfa0c Automatic bundle update 2026-08-29 22:03:10 +00:00
Github Actions 60c35280f1 Automatic bundle update 2026-08-29 21:58:10 +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 456adc6a4f Automatic bundle update 2026-08-28 21:46:47 +00:00
Github Actions 756439ce66 Automatic bundle update 2026-08-28 20:51:52 +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 275d357b6c Automatic bundle update 2026-08-13 15:42:47 +00:00
Github Actions 6b849a4017 Automatic bundle update 2026-08-13 15:39:23 +00:00
Anuken 43d3aa6460 Fixed layout issues with outdated servers / .d.ts generation script 2026-08-12 14:11:59 -04:00
Anuken 9ebf3b966e Merge branch 'master' of https://github.com/Anuken/Mindustry into v9 
# Conflicts:
#	gradle.properties
 2026-08-10 12:15:15 -04:00
Anuken 38a921558d Fixed 'escelating' bundle typo 2026-08-08 11:54:40 -04:00
Anuken e7c4e44530 Merge branch 'master' of https://github.com/Anuken/Mindustry into v9 
# Conflicts:
#	core/src/mindustry/mod/DataImagePacker.java
#	gradle.properties
 2026-08-06 21:54:58 -04:00
Github Actions fc0113c887 Automatic bundle update 2026-08-05 15:54:40 +00: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
Github Actions 65e932039b Automatic bundle update 2026-08-02 06:13:28 +00:00
Anuken ea8cad4f2a Merge branch 'master' of https://github.com/Anuken/Mindustry into v9 
# Conflicts:
#	gradle.properties
 2026-08-02 01:14:26 -04:00
Github Actions c9fe48f6bb Automatic bundle update 2026-08-01 21:53:53 +00:00
Github Actions 3f59a53024 Automatic bundle update 2026-08-01 20:24:51 +00:00
Github Actions e962ed5a25 Automatic bundle update 2026-08-01 19:59:59 +00:00
The4codeblocksandAnuken caa6801ec4 Not privileged setrate [POSTREFORMAT] (#10520) 
* npsr

* npsr deconflict

* npsr cat

* anuke is not a modder

* Update LExecutor.java

* Update LogicBlock.java

* remove nopriv reset

* fix

* avoid credit duplication

* fix version conflict

* Apply suggestion from @Anuken

* Apply suggestion from @Anuken

---------

Co-authored-by: Anuken <arnukren@gmail.com>
 2026-08-01 15:59:22 -04:00
Anuken 02785f49e8 Merge branch 'master' of https://github.com/Anuken/Mindustry into v9 
# Conflicts:
#	core/assets/bundles/bundle_pt_BR.properties
#	gradle.properties
 2026-07-30 21:56:03 -04:00
Github Actions 96393067bf Automatic bundle update 2026-07-27 16:08:25 +00:00
Github Actions 048ea6e56f Automatic bundle update 2026-07-26 16:13:15 +00:00
Anuken 6209a63bba Merge branch 'master' of https://github.com/Anuken/Mindustry into v9 
# Conflicts:
#	core/src/mindustry/type/SectorPreset.java
#	core/src/mindustry/type/StatusEffect.java
 2026-07-17 15:54:22 -04:00