Mirrors/mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-10-01 18:50:27 +03:00
Code Issues Packages Projects Releases Wiki Activity
21,375 Commits 7 Branches 203 Tags
3ebd0c9f4f61680d54f0ca18ed6bf2c1cbcc4a23
Commit Graph
21375 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken 3ebd0c9f4f Merge remote-tracking branch 'origin/master' 2026-09-02 22:01:11 -04:00
Anuken 66e47fdc57 Fixed typo 2026-09-02 22:00:47 -04:00
Github Actions 33bc4c9e6f Automatic bundle update 2026-09-03 01:40:21 +00:00
Anuken a360416946 Better map sorting/filter system (Closes #12349) 2026-09-02 21:39:38 -04:00
Anuken 95f600e87a Merge remote-tracking branch 'origin/master' 2026-09-02 19:09:48 -04:00
Anuken c492376c87 Reduced rotation speed of several larger serpulo turrets to be less ridiculous 2026-09-02 19:09:18 -04:00
SomeonesShade 53b9d15993 Arc Changes and Adding PierceCap for Lightning (#11768) 2026-09-02 18:49:07 -04:00
Anuken 115551b4f4 Merge remote-tracking branch 'origin/master' 2026-09-02 17:48:04 -04:00
Anuken 9e95a4bbc4 No lightning status chance 2026-09-02 17:47:58 -04:00
Github Actions fa59008448 Automatic bundle update 2026-09-02 21:02:23 +00:00
Anuken a298ccfd45 Merge branch 'JasonP01-statusChance' 2026-09-02 17:01:40 -04:00
Anuken ee6c9ae1ab Merge branch 'statusChance' of https://github.com/JasonP01/Mindustry into JasonP01-statusChance 2026-09-02 17:01:37 -04:00
Anuken 8238b9d2c1 Merge remote-tracking branch 'origin/master' 2026-09-02 16:33:14 -04:00
Anuken 49dbd44604 PR Cleanup 2026-09-02 16:33:07 -04:00
Github Actions 553c2beeea Automatic bundle update 2026-09-02 20:32:14 +00:00
CardillanandAnuken 7c0f19a520 Allow automatically disabled mods to be restored (#12263) 
* Allow automatically disabled mods to be restored

* Indicate failed status

* Apply suggestion from @Anuken

* Update bundle.properties

---------

Co-authored-by: Anuken <arnukren@gmail.com>
 2026-09-02 16:31:31 -04:00
Github Actions cbf0025712 Automatic bundle update 2026-09-02 20:22:52 +00:00
summoner 5af84b4ad5 Translation: Update bundle_hu.properties (#12575) 
Translate new strings
fix translation
 2026-09-02 16:22:08 -04:00
redloong 0bb475a54d Translation: Update bundle_zh_CN.properties (#12578) 2026-09-02 16:22:00 -04:00
Anuken db8d9669c2 Fixed #12579 2026-09-02 16:21:26 -04:00
Anuken f7ededb3a1 Removed server list tests 2026-09-02 13:05:13 -04:00
Anuken 69257a2eb4 Removed legacy server lists 
(There was only one server group online for v7, and it had 0 players)
 2026-09-02 12:58:56 -04:00
Anuken 2b3fee983c Fixed bugs related to invalid overlay floors + map colors 2026-09-02 12:46:15 -04:00
Anuken e4045fb8a5 Merge remote-tracking branch 'origin/master' 2026-09-02 10:24:40 -04:00
Anuken 6ef175cb29 Building afterReadAll fix + Send entities over network (possibly unstable) 2026-09-02 10:24:31 -04:00
SITUVNgcd 63e839c67c Fixed campaign.rework.serpulo invisible characters (#12574) 2026-09-02 09:52:47 -04:00
Anuken ccae400bcf Stealing from foos but done properly 2026-09-02 09:48:58 -04:00
JasonP01 dc75f996b0 Merge upstream/master into statusChance 2026-09-02 02:41:19 +02:00
JasonP01 e567777179 revert testing values, and fix stat render 2026-09-02 02:36:14 +02:00
Anuken 667907009d Merge remote-tracking branch 'origin/master' 2026-09-01 20:20:28 -04:00
Anuken b9189a5570 LAccess cleanup 2026-09-01 20:20:21 -04:00
Eric W.andAnuken fac33d08d7 allow memory blocks to store any object (#12459) 
* allow memory blocks to store any object

This changes the way memory blocks are stored in save files.

* fix memory block contents not being restored

`afterReadAll()` seems to require `update` being set to `true`
for being called.

* add myself as a contributor

* reduce boxing when reading/writing memory buildings

This includes some changes to `TypeIO` to prevent
duplicating its reading/writing logic.

* Update TypeIO.java

* Update MemoryBlock.java

* Update TypeIO.java

* Apply suggestion from @Anuken

* Apply suggestion from @Anuken

---------

Co-authored-by: Anuken <arnukren@gmail.com>
 2026-09-01 20:18:03 -04:00
JasonP01 182db13909 fix? stat value 2026-09-02 02:17:48 +02:00
EggleEgg d2ee7cdf42 Bugfix: laserbolt pierces plast walls (#12573) 
* Bugfix: laserbolt pierces plast walls

* whether ugh
 2026-09-01 19:59:09 -04:00
Github Actions cf41adda2b Automatic class mapping and map name update 2026-09-01 23:55:33 +00:00
Github Actions 5720f8b9b6 Automatic bundle update 2026-09-01 23:54:40 +00:00
Anuken b8917ff608 Merge branch 'EggleEgg-dps-dummy' 2026-09-01 19:53:57 -04:00
EggleEgg b3e8aa9294 more or less. Still missing engines 
done I think?

applied revisions from jason

okay should be enough fallbacks

better team getter

dont use multiple configs under saveConfig, the game does not like that

Minor tweaks to DPS dummy
 2026-09-01 19:53:26 -04:00
JasonP01 69cb000395 fix chance in remote places 2026-09-02 01:13:48 +02:00
JasonP01 e115a4a0a0 fix stat values 2026-09-02 00:40:20 +02:00
JasonP01 01fcc9d674 Merge branch 'statusChance' of https://github.com/JasonP01/Mindustry into statusChance 2026-09-02 00:05:46 +02:00
JasonP01 664b7a3e45 update to comply 2026-09-02 00:05:39 +02:00
JasonP01 aeba3e1f63 Merge remote-tracking branch 'upstream/master' into statusChance 2026-09-01 23:20:43 +02:00
Anuken 27d7a2917e Merge remote-tracking branch 'origin/master' 2026-09-01 17:18:41 -04:00
Anuken 023a4ff1ae Fixed logic privileged access check 2026-09-01 17:18:34 -04:00
SomeonesShade 7509cb1375 Nova Buff (#11769) 
* Nova Changes v3

* merging from egglegg

* Removed randomTimer

* Adjusted Nova Stats

* That reload change wasn't a good idea

* Nova Heal Rate nerf (15 hp/s -> 10 hp/s) same inter-nova heal and Hp nerf (240 -> 200 hp)

* Nerfed Nova DPS (2x32.5 -> 2x26)
 Lowered smart downtime for novas
 2026-09-01 16:54:58 -04:00
Github Actions bc3a701b93 Automatic bundle update 2026-09-01 20:51:26 +00:00
Anuken 6be1d664b0 Merge branch 'summoner001-master' 2026-09-01 16:50:45 -04:00
Anuken aa929b9c61 Merge branch 'master' of https://github.com/summoner001/Mindustry into summoner001-master 2026-09-01 16:50:37 -04:00
Github Actions 2504e6a93c Automatic bundle update 2026-09-01 20:50:26 +00:00