mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-01-28 07:22:21 -08:00
Code Issues Projects Releases Wiki Activity
18866 commits 4 branches 175 tags 2.4 GiB
Commit graph

18866 commits

This branch
This branch
All branches
Author SHA1 Message Date
Anuken
1bf2e8d818 Minor tiled display cost reduction 2025-04-16 18:48:43 -04:00
Anuken
bf0142d8c4 Merge remote-tracking branch 'origin/master' 2025-04-16 16:51:03 -04:00
Anuken
1838a8ee12 Merge branch 'tiled-logic-displays' of https://github.com/Anuken/Mindustry 2025-04-16 16:50:52 -04:00
buthed010203
7d707a431f
Fix contains checking wrong variable (#10668) 2025-04-16 15:07:33 -04:00
Anuken
9cadf06c92 Minor optimization 2025-04-16 13:06:15 -04:00
Anuken
9db19fafe7 Fixed legacy launch pads in extraction outpost 2025-04-16 10:22:43 -04:00
Anuken
3249d042d1 Merge remote-tracking branch 'origin/master' 2025-04-16 00:19:09 -04:00
Anuken
f994d2929f Fungal pass added to T2 unit requirements 2025-04-16 00:18:46 -04:00
EggleEgg
3892416993
Scathe ammo rebalance (#10660) 
* Update Blocks.java

* Update Blocks.java
 2025-04-16 00:08:35 -04:00
WMF
39834f21db
ServerControl was broken, yet again (#10661) 2025-04-15 15:42:45 -04:00
Anuken
b45afe1f4c comment 2025-04-15 15:39:28 -04:00
Anuken
cc4c18211b Merge remote-tracking branch 'origin/tiled-logic-displays' into tiled-logic-displays 2025-04-15 12:16:22 -04:00
Anuken
841ea4f78e Retain display contents when merging 2025-04-15 12:16:09 -04:00
Github Actions
056f56db95 Automatic bundle update 2025-04-15 03:23:38 +00:00
Anuken
e2ae2e4f71 Tiled background for tiled logic display 2025-04-14 23:20:29 -04:00
Anuken
1a00264902 Merge branch 'master' of https://github.com/Anuken/Mindustry into tileable-logic-displays 
# Conflicts:
#	core/assets/icons/icons.properties
#	core/assets/logicids.dat
 2025-04-14 22:50:47 -04:00
Anuken
666c68edb1 Fixed #10656 2025-04-14 20:36:07 -04:00
Anuken
bfeb8ccc38 Fixed command mode button not showing up after toggling editor blocks on mobile 2025-04-14 20:02:01 -04:00
Anuken
d207c3261f Merge remote-tracking branch 'origin/master' 2025-04-14 15:13:42 -04:00
Anuken
4d35c8a128 Reverted bridge cost increase 2025-04-14 15:13:30 -04:00
OGalaxy
42dcb9989d
Update servers_v7.json (#10654) 
Added new game mode
 2025-04-14 14:33:18 -04:00
Anuken
974b37a4cd
Update deployment.yml 2025-04-14 11:38:31 -04:00
Anuken
f2d97503d0 Fixed #10651 2025-04-14 11:35:12 -04:00
Anuken
988e8c1eaa Fixed #10652 2025-04-14 11:34:21 -04:00
Anuken
c59daa5bbb Possible crash fix 2025-04-13 22:46:43 -04:00
Anuken
93a784d0e8 Merge remote-tracking branch 'origin/master' 2025-04-13 22:36:18 -04:00
Anuken
061caaa092 Crash fixes 2025-04-13 22:36:12 -04:00
Github Actions
67efdfa259 Automatic bundle update 2025-04-14 02:28:26 +00:00
Kevin Vilyan
819c975027
Update Indonesian Translation for Steam page and in-game (#10619) 
* Add files via upload

* Add files via upload

* Update achievements.vdf

* Update description.txt

* ID bundle translation fixes and additions

fixed spacing, suffixes, and in-game symbols, added strings from original bundle upstream

* ID Steam translation fix

* replaced incompatiblemod in id_ID

* wrong mouse button in id_ID

"right click" when it's supposed to be "left click"

* fix. no more changes.

* Small Changes

* revert unintended change

* fixed.

* Update achievements.vdf

* Update bundle_id_ID.properties

* trademark of Steam

---------

Co-authored-by: Thomas Widyantoko <40286070+DaGamerFiles@users.noreply.github.com>
Co-authored-by: Tegas Aziz <49786146+WilloIzCitron@users.noreply.github.com>
 2025-04-13 22:27:41 -04:00
summoner001
3e8e9d2dd7
Update bundle_hu.properties (#10617) 
* Update bundle_hu.properties

Fixing core launch/land string in Hungarian

* Translate new strings

* Update bundle_hu.properties

delete extra lines and spaces

* Update bundle_hu.properties

Fix typos
 2025-04-13 22:27:21 -04:00
Anuken
62585a32b3 Fixed #10647 2025-04-13 22:26:00 -04:00
Anuken
a906ce0cd9 Merge remote-tracking branch 'origin/master' 2025-04-13 22:23:42 -04:00
Anuken
017fbeb4e9 Misc UI fixes 2025-04-13 22:23:32 -04:00
BalaM314
8b235a9915
Fix #10645 (#10646) 2025-04-13 10:47:20 -04:00
Anuken
1b6c0c7717 Minor bugfixes + ClassMap update 2025-04-13 10:05:57 -04:00
Anuken
1fb0946b86 Fixed #10645 2025-04-13 09:29:33 -04:00
Anuken
31cdbe55bf Fixed #10640 2025-04-12 23:42:24 -04:00
Anuken
f70a59c604 Fixed #10639 2025-04-12 23:39:20 -04:00
Anuken
7209d71eeb Merge remote-tracking branch 'origin/master' 2025-04-12 21:20:10 -04:00
Anuken
ad13e75d55 Sector icon outline 2025-04-12 21:20:02 -04:00
SeuEarth
0ec00cdd17
Update Korean translation (#10625) 
* Update bundle_ko.properties

* Update achievements.vdf

* Update description.txt

* Update bundle_ko.properties

* Update bundle_ko.properties
 2025-04-12 20:21:50 -04:00
Arktcode
911546375b
Update bundle_es.properties for V8 (#10629) 
* Update bundle_es.properties V8

* Update bundle_es.properties Others blocks
 2025-04-12 16:21:37 -04:00
Github Actions
667d8441a4 Automatic bundle update 2025-04-12 15:37:40 +00:00
Anuken
da2821f220 Difficulty info tooltips 2025-04-12 11:36:49 -04:00
Anuken
f50f935232 Fixed #10632 2025-04-12 10:27:18 -04:00
Anuken
4cf72fc161 arc 2025-04-12 09:41:31 -04:00
Anuken
27eca86547 Hide mobile command mode only when editor blocks are shown 2025-04-12 09:34:16 -04:00
Anuken
c54b1dcb6a Clamp refund multiplier rule in UI 2025-04-12 09:32:19 -04:00
Anuken
2d214524df Updated RoboVM 2025-04-12 09:23:27 -04:00
Anuken
7b608bfaa4 arc 2025-04-12 09:06:12 -04:00