Compare commits

..

451 Commits
v149 ... v151

Author SHA1 Message Date
Github Actions
4981808529 Automatic bundle update 2025-08-24 22:37:19 +00:00
summoner
c8aa91f28a Translation: Update bundle_hu.properties (#11088)
* Translation: Update hu.properties

Rewording some sentences to make them more similar to others (fix consistency and coherency).

* Update bundle_hu.properties

Translate new strings

* Update bundle_hu.properties

Translate new strings

* Update bundle_hu.properties

Translate new string.
Fixing Crux/Malis/Sharded translation. Set back to original names. Until now I thought they were colours. I found out that they are the names of the factions in Mindustry (like terran/zerg/protoss in the Starcraft) but and each has a corresponding colour. Sorry. Fixed for now.
2025-08-24 18:36:00 -04:00
Buj
3cba93a962 autoscale and text alignment flags for world labels (#11166)
Co-authored-by: buj <buj351@outlook.com>
2025-08-24 18:19:46 -04:00
Anuken
3a8fe9337c Merge remote-tracking branch 'origin/master' 2025-08-24 17:54:01 -04:00
Anuken
ce5b4fa3f8 Runes added to font 2025-08-24 17:53:35 -04:00
Github Actions
02f7c4bd47 Automatic bundle update 2025-08-24 20:49:48 +00:00
Anuken
2f5abdb7e5 NPC rune decorations 2025-08-24 16:48:40 -04:00
Anuken
5217e08823 Possible content deserialization crash fix 2025-08-24 16:48:33 -04:00
Anuken
2f16449a6f Merge remote-tracking branch 'origin/master' 2025-08-24 16:48:24 -04:00
Anuken
1fb2c58c1a Added missing metal wall bundle entries 2025-08-24 16:48:18 -04:00
Kevin Vilyan
dbf29ae493 Add files via upload (#11167) 2025-08-24 16:47:38 -04:00
SeuEarth
65e05951ff Update bundle_ko.properties (#11170) 2025-08-24 16:47:28 -04:00
EggleEgg
22d85e4c7a More erekir turret rebalance (#11162)
* real

* afflict stuff

* this should work ig

* wip

* real

* a

* maybe?

* a
2025-08-24 16:42:49 -04:00
Anuken
ee38bb2857 Fixed #11171 2025-08-24 16:39:16 -04:00
Anuken
c07d570991 Fixed #11169 2025-08-24 16:30:37 -04:00
Anuken
ed646b0baa Merge remote-tracking branch 'origin/master' 2025-08-23 17:05:13 -04:00
Anuken
42fb6b7a72 New environmental metal wall blocks 2025-08-23 17:04:57 -04:00
Sputnuc
f440d99de6 localize launch pad, landing pad and tile logic display (#11002) 2025-08-23 11:28:46 -04:00
Github Actions
51588ceef1 Automatic bundle update 2025-08-22 04:43:36 +00:00
Anuken
32da91e789 Erekir turret balancing changes 2025-08-22 00:42:20 -04:00
Anuken
d89450d7e7 Fixed #11155 2025-08-21 14:07:53 -04:00
Anuken
6d86707781 Utility schematic method changes / Geothermal map submission update 2025-08-20 12:09:25 -04:00
Anuken
a7d1714fe8 Testing out runes in Facility32m map 2025-08-19 17:03:50 -04:00
Anuken
ca472acf9b Rune color adjustments 2025-08-19 17:01:59 -04:00
Anuken
fec085f20e Minor rune adjustments 2025-08-19 16:19:24 -04:00
Anuken
13e81b85bf Fixed #11153 2025-08-19 15:33:25 -04:00
Anuken
16f163a33d Merge remote-tracking branch 'origin/master' 2025-08-19 15:27:12 -04:00
Anuken
c6e4900825 Fixed #11152 2025-08-19 15:27:07 -04:00
Github Actions
53293bd890 Automatic bundle update 2025-08-19 19:19:52 +00:00
Anuken
ba7d0a29bb Crux language runes 2025-08-19 15:17:06 -04:00
Anuken
7cbbc5d7ac Fixed #11150 2025-08-18 01:33:39 -04:00
Anuken
3521eef8f4 Merge remote-tracking branch 'origin/master' 2025-08-17 23:57:51 -04:00
Anuken
419757ddee Fixed #11149 2025-08-17 23:57:45 -04:00
Moreperbullet
0fd46cf057 Turn killable from variable to method (#11146)
* Turn killable from variable to method

* Update UnitType.java

* Update UnitComp.java
2025-08-17 10:26:00 -04:00
Anuken
d1222fe8f1 Fixed #11147 2025-08-17 10:25:35 -04:00
Anuken
1fe5055a96 Fixed #11144 2025-08-17 10:22:22 -04:00
Anuken
76da302458 Merge remote-tracking branch 'origin/master' 2025-08-17 09:23:58 -04:00
Anuken
15ce195a78 Fixed #11143 / PLT map tile updates 2025-08-17 09:23:51 -04:00
blackberry2093
61f538e0cb Update servers_v7.json (#11116) 2025-08-16 15:34:00 -04:00
Anuken
770a2745d2 Merge remote-tracking branch 'origin/master' 2025-08-16 08:56:09 -04:00
Anuken
640f181e48 Fixed #11139 2025-08-16 08:56:03 -04:00
router
aa81b13302 KILL the fish servers (#11137) 2025-08-16 08:55:03 -04:00
Anuken
8251b33a03 More precision in block stats 2025-08-15 20:35:36 -04:00
Anuken
915c8090c7 Fixed #11129 2025-08-14 14:35:37 -04:00
Anuken
74a69f11da Fixed #11130 2025-08-14 14:25:58 -04:00
Anuken
b3b3bc64b8 Fixed #11128 2025-08-14 14:24:58 -04:00
Anuken
d73802c6bf Merge remote-tracking branch 'origin/master' 2025-08-14 14:20:43 -04:00
Anuken
f410e24da0 Fixed #11127 2025-08-14 14:20:37 -04:00
Jason
10680a2557 fix #11123 (#11124) 2025-08-14 14:19:07 -04:00
Anuken
246db930d4 Fixed #11126 2025-08-14 14:17:40 -04:00
WayZer
65a50a9742 CargoAI will switch dropPoint fairly (#11122)
* Update CargoAI.java

* Simplifying findDropTarget
2025-08-12 03:22:04 -04:00
Anuken
10ceb8eac9 Fixed #11121 2025-08-12 09:21:05 +02:00
Anuken
4e82396be1 Low-FPS bullet behavior fixes 2025-08-10 14:37:32 +02:00
Anuken
dac299bf25 Fixed mirror filter not accoounting for data 2025-08-10 11:07:01 +02:00
Anuken
a6e8683b45 Fixed #11114 2025-08-10 09:41:44 +02:00
Anuken
a03512696d Update SERVERLIST.md 2025-08-09 12:16:45 -04:00
Anuken
451852ca97 Fixed #11106 2025-08-08 16:29:03 +02:00
Github Actions
9b3e9caa3f Automatic bundle update 2025-08-08 14:23:51 +00:00
Anuken
4520d004ec Deprecation warning for 32-bit Windows users 2025-08-08 16:22:25 +02:00
Anuken
0ca37719bb Server crash fix 2025-08-07 21:12:56 +02:00
Anuken
0bdf4efcdd Alternate sync implementation for non-update blocks - Closes #11099 2025-08-06 21:54:38 +02:00
Anuken
6707ff5fdf Fixed #11097 2025-08-05 20:07:44 +02:00
Anuken
e37852f312 Logic read/write cleanup and validity fixes 2025-08-05 10:49:42 +02:00
Anuken
2170ea3de4 Default settings tweaks for iOS 2025-08-04 20:18:06 +02:00
Anuken
14d2141b77 Fixed #11093 2025-08-04 20:13:31 +02:00
alecthe2nd
6cd4658c1f Fixed target ore check requiring wall-only miners to check for floor ore versions when deciding whether to mine the respective ore. (#11089) 2025-08-03 03:20:27 -04:00
Anuken
067eb0ed27 Rare player network error fix 2025-08-02 19:02:06 +02:00
Anuken
db7aba8ea0 NaN checks for volume (from arc) 2025-08-01 19:50:29 +02:00
Anuken
4a43e963ca Fixed #11085 2025-08-01 19:32:28 +02:00
Github Actions
89ba79ca49 Automatic bundle update 2025-08-01 09:20:04 +00:00
summoner
f105b24eb7 Update bundle_hu.properties (#11043)
* Update bundle_hu.properties

Follow the changes of the english bundle
Fix some sentences

* Follow the changes of the english bundle.

* Fix wording

* Fix wording

* Fixing sentences

* Update bundle_hu.properties

Translate new string

* Translate new strings
2025-08-01 05:18:51 -04:00
SITUVNgcd
9d77851d0d Update Vietnamese translation (#11076)
* Update Vietnamese translation

1. Bundle file
  - Translated new strings.
  - Optimized translations.
  - Fixed some typos.
  - Better translation for some words.

2. Android & Steam
  Added translations for Android and Steam app on fastlane.

* Typo & gammar fix

* Typo & gammar fix

* 0x0A new line?

* Update & translate new strings

* Translate new strings

011b9492a0

* Translate new strings

397e190790

* Translate new strings

b66f9b503b

* Translate new strings

c6ce5a200f

* Translate new strings & update

77c4f27046

* Translate new string & update/fix

1283355f30

* Transalte new strings

c1dfb02904

* Translate new strings & update

479a84ba32
2025-08-01 05:18:15 -04:00
firfaronde
8557a3defa Update bundle_ru.properties (#11079)
* Update bundle_ru.properties

* Update bundle_ru.properties
2025-08-01 05:18:01 -04:00
SeuEarth
a85b0f08ae Update bundle_ko.properties (#11074)
* Update bundle_ko.properties

* Metal/Colored floors and fix

* Update bundle_ko.properties
2025-08-01 05:14:48 -04:00
Anuken
a2dc0cf9f7 Select statement mobile layout fix 2025-08-01 05:14:06 -04:00
Anuken
0320ccbccd Schematic content ID mapping 2025-08-01 04:32:17 -04:00
Anuken
e95c543fb2 Allow commanding units properly even when player is dead 2025-07-28 18:04:15 -04:00
Anuken
1d7b6eb689 Alternate overrange approach 2025-07-28 11:34:56 -04:00
Anuken
ec6cd2e7ce More breach overrange 2025-07-28 10:46:22 -04:00
Anuken
a9de4f8caf Merge remote-tracking branch 'origin/master' 2025-07-28 10:14:47 -04:00
Anuken
07d6143bc3 Fixed #11072 2025-07-28 10:14:42 -04:00
MEEPofFaith
4938bcaeb1 Config pick (#11073)
* Pick Configs

* Fix character overlay picking

* More descriptive method name
2025-07-28 09:56:55 -04:00
Anuken
efccaeb7fc Crash fix 2025-07-28 00:50:38 -04:00
Anuken
fb0d335ea5 Cryofluid overlay support 2025-07-28 00:05:30 -04:00
Anuken
a1b7838334 Merge remote-tracking branch 'origin/master' 2025-07-27 23:52:51 -04:00
Anuken
0a2d8576fd Fixed rendering of liquids under floors 2025-07-27 23:52:19 -04:00
Github Actions
479a84ba32 Automatic bundle update 2025-07-27 21:17:10 +00:00
Anuken
9455051429 Moved "cliffs" button into fill tool 2025-07-27 17:15:52 -04:00
Anuken
a2dd8be4f9 Fixed 'walls to cliffs' not being undoable 2025-07-27 17:04:04 -04:00
Anuken
65f1785fb6 Colored tile undo/fill support 2025-07-27 16:49:25 -04:00
itflakess
2168498a6d Update bundle_zh_CN.properties (#11032)
* 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

* 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

* 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

* Update bundle_zh_CN.properties
2025-07-27 15:47:41 -04:00
Anuken
bdf521bd1c WIP editor color stuff support (broken) 2025-07-27 15:46:58 -04:00
Cardillan
9ea4af779e Sensor operating on incorrect tile of a tileable display (#11069)
* Sensor operating on incorrect tile of a tileable display

* Moved rootDisplay to LogicDisplayBuild
2025-07-27 10:47:44 -04:00
Anuken
5691d46199 Merge remote-tracking branch 'origin/master' 2025-07-27 00:50:19 -04:00
Anuken
0aa1bd7df9 Multi-building command selection 2025-07-27 00:50:10 -04:00
Cardillan
9cb3481ef2 Support for sensing build requirements (#11066) 2025-07-26 18:36:50 -04:00
SomeonesShade
91ef4aaa48 smallHeatRedirector research cost adjustments (#11067) 2025-07-26 12:18:41 -04:00
Anuken
57ae1b3ec1 Fixed #11065 2025-07-26 09:59:52 -04:00
Anuken
5730850039 Fixed #11062 2025-07-26 09:45:57 -04:00
Anuken
732b7624e8 Clearer indication of launch origin sector 2025-07-25 16:24:38 -04:00
Anuken
982e072603 Merge remote-tracking branch 'origin/master' 2025-07-25 12:51:17 -04:00
Anuken
7237249d18 NPC clog fix / Team sense fix 2025-07-25 12:51:11 -04:00
Cardillan
13f39b6b57 Make LExecutor.maxInstructions non-final (#11056) 2025-07-25 10:41:46 -04:00
Anuken
1dc1e50502 Merge remote-tracking branch 'origin/master' 2025-07-24 22:37:29 -04:00
Anuken
271c015114 Fixed floor renderer float[] rendering 2025-07-24 22:37:18 -04:00
Github Actions
f7bd3f71c6 Automatic bundle update 2025-07-24 22:41:43 +00:00
Anuken
40d459b1b6 Hint for upgrading units 2025-07-24 18:40:31 -04:00
Anuken
3ceb705cb5 Display hovered sector on mobile 2025-07-24 18:20:37 -04:00
Anuken
8693ad351a Erekir bridge link previews 2025-07-24 16:57:04 -04:00
Anuken
9696ddf993 Allow spawnpoint edits in-game (closes Anuken/Mindustry-Suggestions/issues/5754) 2025-07-24 14:47:32 -04:00
Anuken
3e860c5f29 Merge remote-tracking branch 'origin/master' 2025-07-24 11:53:30 -04:00
Anuken
f5b8efb10c Fixed scaling of server list headers 2025-07-24 11:53:22 -04:00
A4-Tacks
242cc50f3e Fix bundles lenum.emod description (#11050) 2025-07-24 11:47:37 -04:00
315923876
b311ef7e2c Update servers_v7.json --old domain about expired, change to new domain (#11049)
* Update servers_v7.json

domain about expired, change to new domain.
remove the unused domain

* Update servers_v7.json
2025-07-24 11:47:23 -04:00
Anuken
b9c602e723 Merge remote-tracking branch 'origin/master' 2025-07-24 01:00:37 -04:00
Anuken
c3e1b8b329 Added extra checks to see if they help server duplication 2025-07-24 01:00:30 -04:00
Волшебник
2ef96a21fb New host (#11044)
This is not a new server, just a move to another host.
2025-07-23 12:24:29 -04:00
Anuken
697396d1c6 Added -gltrace desktop launch flag 2025-07-23 11:41:16 -04:00
Anuken
3e50f1be5f Fixed spawn points not rendering in editor 2025-07-22 22:53:03 -04:00
Anuken
a5138ab9dc Colored floor map preview fix 2025-07-22 19:08:16 -04:00
Anuken
1e675a8004 Removed NPC reactor tutorial 2025-07-22 18:33:59 -04:00
Anuken
f53e22c418 Merge remote-tracking branch 'origin/master' 2025-07-22 18:33:00 -04:00
Anuken
692fa2d5ff iOS fixes 2025-07-22 18:32:53 -04:00
Twcash
cc8e619fd9 NPC (#11006) 2025-07-22 18:32:35 -04:00
summoner
119694cda1 Update bundle_hu.properties (#11029)
* Update bundle_hu.properties

Translate new strings
Fixing coherence
Fixing typos
Rewording some sentence translations

* Fixing misspells

* Update bundle_hu.properties

Sentence and wording fixes

* Update bundle_hu.properties

fix wording
2025-07-22 18:06:47 -04:00
SeuEarth
60bc5e96e8 Update bundle_ko.properties (#11024)
* Update bundle_ko.properties

* Metal/Colored floors and fix
2025-07-22 17:38:38 -04:00
Anuken
05267a3f40 Testing keyboard controls on iOS 2025-07-22 17:26:25 -04:00
Anuken
17a5b2f387 Closes Anuken/Mindustry-Suggestions/issues/5742 2025-07-22 11:41:15 -04:00
Anuken
fdae9a14fe Merge remote-tracking branch 'origin/master' 2025-07-22 00:23:09 -04:00
Anuken
88b1fc014b Just checking to see if desugaring of the desktop module works 2025-07-22 00:23:04 -04:00
SITUVNgcd
c8bfa16774 Typo & gammar fix for Vietnamese translation on Steam achivements (#10718)
* Update Vietnamese translation

1. Bundle file
  - Translated new strings.
  - Optimized translations.
  - Fixed some typos.
  - Better translation for some words.

2. Android & Steam
  Added translations for Android and Steam app on fastlane.

* Typo & gammar fix

* Typo & gammar fix

* 0x0A new line?

* Update & translate new strings

* Translate new strings

011b9492a0

* Translate new strings

397e190790

* Translate new strings

b66f9b503b

* Translate new strings

c6ce5a200f

* Translate new strings & update

77c4f27046

* Translate new string & update/fix

1283355f30

* Transalte new strings

c1dfb02904
2025-07-22 00:13:59 -04:00
Anuken
73a628f426 Refresh community servers upon failure 2025-07-22 00:13:18 -04:00
Anuken
fabbf6eab3 nothing 2025-07-21 23:15:21 -04:00
Anuken
619887ec4b Packed uv and positions for floor and editor renderer 2025-07-21 20:32:44 -04:00
Anuken
b412830062 Merge remote-tracking branch 'origin/master' 2025-07-21 12:30:22 -04:00
Anuken
1371f3f7be Fixed #11026 2025-07-21 12:30:16 -04:00
Stormrider
1680377d37 minor stormrider map polish and fixes (#11023) 2025-07-21 12:26:20 -04:00
DarkJune
f138fb96b7 Updates building when related button state changes + Reordering (#11028) 2025-07-21 03:15:45 -04:00
Anuken
8a8551b3cd Merge remote-tracking branch 'origin/master' 2025-07-21 03:09:47 -04:00
Anuken
b0fe88b119 Closes Anuken/Mindustry-Suggestions/issues/5737 2025-07-21 03:09:41 -04:00
Github Actions
c1dfb02904 Automatic bundle update 2025-07-21 06:45:50 +00:00
Anuken
48554c3560 Merge branch 'master' of https://github.com/Anuken/Mindustry 2025-07-21 02:43:11 -04:00
Anuken
c0a551a006 Merge branch 'crux-floor' of https://github.com/Anuken/MindustryPrivate 2025-07-21 02:43:02 -04:00
Anuken
0c15d1be86 Proper naming for metal floors 2025-07-21 02:42:25 -04:00
Anuken
f6745a6b80 Reordered floors 2025-07-21 02:29:10 -04:00
Anuken
f0820572ce Cleanup 2025-07-21 02:17:07 -04:00
Anuken
fab3c08ddb Mobile improvements 2025-07-20 20:05:32 -04:00
Anuken
6e44ff1de1 Misc map editor fixes 2025-07-20 19:33:37 -04:00
Anuken
6cd3a0a096 Partially implemented new building rendering 2025-07-20 17:06:03 -04:00
Anuken
72e9db57a4 WIP unification and cleanup of rendering in editor 2025-07-19 15:06:00 -04:00
Anuken
c32f7473e8 Fixed sprites in wrong atlas 2025-07-18 18:53:58 -04:00
Anuken
2e41e58b59 Color variant for character 2025-07-18 18:23:00 -04:00
Anuken
7ed243a808 let's not do that 2025-07-18 18:16:06 -04:00
Anuken
fba935c527 Char tile picker support 2025-07-18 18:14:32 -04:00
Anuken
4abc2aba8c Character overlay block 2025-07-18 13:57:07 -04:00
Anuken
895c4da2f6 Better logging for unknown save versions 2025-07-18 11:22:11 -04:00
Anuken
78c604946e Bundle entries 2025-07-17 23:31:45 -04:00
Anuken
9b5ce972e9 Collapser color edit fix 2025-07-17 20:32:11 -04:00
Cardillan
549fa1a065 Setting null to counter should be a no-op (#11012) 2025-07-17 18:45:47 -04:00
Anuken
64471cf817 Block color pick fix 2025-07-17 16:52:19 -04:00
Anuken
24cfb000de Better colored floor/wall support 2025-07-17 16:09:45 -04:00
Github Actions
82152948e9 Automatic bundle update 2025-07-16 19:14:15 +00:00
Thomas Widyantoko
10610ec464 Indonesian bundle upstream and fixes (#11020)
Indonesian bundle upstream with main bundle and changed affixes with "butuh" to a more neutral "perlu".
2025-07-16 15:13:02 -04:00
DarkJune
dcc8625bab Allowing multiple planets to have the same tech tree (#11017)
* Lists all planets having the same TechTree associated with them.

As of right now, this problem arizes only with modded games. If you add planets in a specific order (e.g. StarA, PlanetA, PlanetB) and attach same tech tree to all of them - only items from the first planet (StarA) will be used and accounted for.

You can see this if you try to attach Serpulo's TechTree to Planets.sun - no resources from Serpulo will be visible and usable in Serpulo's TechTree in ResearchWindow (or anywhere for that matter).

* Removed spaces

* Added braces, if anyone will need to expand the code later (ig)
2025-07-16 15:10:53 -04:00
Anuken
cc02c15844 Power node underBullets 2025-07-15 18:40:04 -04:00
Anuken
4c8f956fef Fixed colored wall data reset 2025-07-15 14:59:58 -04:00
Anuken
cb7e027b2b Yet another floor 2025-07-15 14:45:50 -04:00
Anuken
b714651055 Colored wall block 2025-07-15 11:45:56 -04:00
Anuken
547ceff736 Merge branch 'master' of https://github.com/Anuken/Mindustry into crux-floor 2025-07-15 11:03:19 -04:00
Anuken
95a6850ce5 Reverted power node build time multiplier / No mono global selection 2025-07-15 10:58:20 -04:00
Anuken
ee1cbf5b01 another floor 2025-07-15 01:29:38 -04:00
Anuken
fbd9a7c40a More floor stuff 2025-07-14 23:49:09 -04:00
Anuken
c2f365a92c more textures 2025-07-14 02:18:19 -04:00
Anuken
015f0bbc23 And yet another floor 2025-07-14 01:56:20 -04:00
Anuken
3a33c53e8f Cleanup 2025-07-13 19:28:25 -04:00
Anuken
7cc000ed46 Made tiles not clear overlay on setFloor + cleanup/refactor 2025-07-13 17:00:12 -04:00
Anuken
b3ee9884ab more floors 2025-07-13 01:29:18 -04:00
Anuken
88b2f9c2bc Funny experiments with colored floors 2025-07-12 19:22:53 -04:00
Anuken
e53201347f Colored floor tile 2025-07-12 18:16:26 -04:00
Anuken
0939076b4d Better tile custom data support 2025-07-12 17:28:39 -04:00
Anuken
086933614b Better pathfinder allDeep calculation 2025-07-12 14:26:02 -04:00
Anuken
aeee327e6c Fixed #11009 2025-07-12 12:42:05 -04:00
Anuken
5e6d599120 More floor stuff 2025-07-12 12:33:11 -04:00
Anuken
7119d6852c More tile progress 2025-07-11 20:09:14 -04:00
Anuken
f9b6e3c0a6 More tile progress 2025-07-11 19:07:31 -04:00
Anuken
8c3840b7ac More floor stuff 2025-07-11 17:51:59 -04:00
Anuken
0539d00cda Re-added non-indexed mesh support 2025-07-11 11:51:55 -04:00
Anuken
f5f1933923 Mining units now search for the closest ore to the core, not themselves 2025-07-11 10:56:25 -04:00
Anuken
c7db8dc625 Better zoom clamp for planets 2025-07-10 22:22:57 -04:00
Anuken
1220a7a4a8 Floor experiment progress 2025-07-10 19:47:39 -04:00
Anuken
0bd404eb4f Merge branch 'master' of https://github.com/Anuken/Mindustry into crux-floor 2025-07-10 16:45:45 -04:00
Anuken
3cacc3c8c6 Closes Anuken/Mindustry-Suggestions/issues/5712 2025-07-10 14:49:12 -04:00
Anuken
95e13f99a1 Merge branch 'master' of https://github.com/Anuken/Mindustry into crux-floor
# Conflicts:
#	gradle.properties
2025-07-10 13:52:31 -04:00
Anuken
0ecf84349c Merge branch 'crux-floor' of https://github.com/Anuken/MindustryPrivate into crux-floor 2025-07-10 13:51:47 -04:00
Anuken
1283355f30 Renamed bufferUsage -> bufferSize / Removed link name 'memory' 2025-07-10 13:34:46 -04:00
Anuken
4790c8013b Static wall autotile support 2025-07-10 13:18:08 -04:00
1ue999
26b349e5dd ReadI/WriteI interface for modding (and removal of if/else tree) (#11000)
* progress

* progress

* moar progress

* commits every 5 seconds poggers (done with LogicBuild)

* implement interface

* oop forgor to remove part of the old ReadI

* unnecessary import removed

* who needs a space? i got a spare one

* implement great suggestion by [object Object]

* more of this

* slipped past me

* more consistency
2025-07-09 23:20:35 -04:00
WMF
b327f8be1f update applySlowdown correctly (#11003) 2025-07-09 22:31:05 -04:00
Pøzɨt¡vɇ
479a7c3b78 Update servers_v7.json (#11001)
Change IPs for XCore server.
2025-07-09 12:21:25 -04:00
Anuken
bcc29e20ae Component interface cleanup 2025-07-07 20:03:22 -04:00
Anuken
4aa801f504 Fixed #10998 2025-07-07 12:59:03 -04:00
Anuken
ef7ef39523 Fixed unnecessary import dialog after multi-mod install 2025-07-07 01:32:44 -04:00
Anuken
05349a4aef Fixed avoidance layering 2025-07-06 20:33:13 -04:00
Anuken
f0d8c06380 Faster avoidance calculation 2025-07-06 14:23:50 -04:00
Anuken
b5eba35ed9 Merge branch 'master' of https://github.com/Anuken/Mindustry into wave-pathfind-avoidance 2025-07-06 13:13:55 -04:00
Anuken
0a59aa8a85 Merge remote-tracking branch 'origin/master' 2025-07-06 13:06:42 -04:00
Anuken
ed6bb93a09 Cleanup 2025-07-06 13:06:35 -04:00
Github Actions
bc222238d4 Automatic bundle update 2025-07-06 17:01:36 +00:00
Anuken
71c8c79e58 Merge remote-tracking branch 'origin/master' 2025-07-06 12:59:59 -04:00
Anuken
877bb473df Debug hitbox toggle hotkey 2025-07-06 12:59:45 -04:00
Github Actions
7500ad91b2 Automatic bundle update 2025-07-06 16:38:19 +00:00
Anuken
6ae6da35c4 Merge remote-tracking branch 'origin/master' 2025-07-06 12:36:43 -04:00
Anuken
5c42dc4199 Debug renderer for unit hitboxes 2025-07-06 12:36:32 -04:00
Anuken
a815c7f39a Added settings value for 'detach camera' hotkey 2025-07-06 12:08:00 -04:00
Anuken
b006a2a4f5 Better conditional avoidance system 2025-07-06 01:20:57 -04:00
Github Actions
077195cc12 Automatic bundle update 2025-07-06 04:14:48 +00:00
SeuEarth
b037be2b0a Update bundle_ko.properties (#10747)
* Update bundle_ko.properties

* Update bundle_ko.properties

* New things

* Update bundle_ko.properties

* fixes

* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* fixes

* fixing the mistake

* Update bundle_ko.properties
2025-07-06 00:13:24 -04:00
summoner
921b845b7d Update bundle_hu.properties (#10753)
* Update bundle_hu.properties

Translate new strings

* Update bundle_hu.properties

Follow the changes of the english bundle

* Update bundle_hu.properties

Translate new strings

* Update bundle_hu.properties

Fixing typos and coherence

* Translate new string

* Minor fix

* Follow the english bundle changes

* Translate new string

* Update bundle_hu.properties

spelling improvement

* Update description.txt

spelling improvement

* Update achievements.vdf

spelling improvement

* update core/assets/bundles/bundle_hu.properties

* Fix duplicated lines

* Follow the english bundle changes - quell

* Fix wording

* Translate new strings

Translate new strings

* Update bundle_hu.properties

Translate new string

* Follow the changes of the english bundle

* Delete extra empty line

* Follow the changes of the english bundle

* Sentence fix

* Sentence fix

* Fix wording

* Add missing word
2025-07-06 00:12:37 -04:00
Anuken
21ef30531a Merge remote-tracking branch 'origin/master' 2025-07-05 18:06:54 -04:00
Anuken
3d3507dec9 Closes Anuken/Mindustry-Suggestions/issues/5703 2025-07-05 18:06:46 -04:00
WMF
d1b4158285 make pathfinder acknowledge that status effects given by floors can do damage too (#10987) 2025-07-04 10:41:15 -04:00
Anuken
d6877a2320 . 2025-07-04 01:03:12 -04:00
Anuken
ef07d504e8 Fixed #10984 2025-07-03 23:41:32 -04:00
Anuken
da402b85c6 NO 2025-07-03 23:40:48 -04:00
Anuken
044b47cfd5 Unit avoidance for wave pathfinder (mostly broken) 2025-07-03 23:29:05 -04:00
Anuken
5340de4f62 no 2025-07-03 23:12:42 -04:00
Anuken
189795ff04 Merge remote-tracking branch 'origin/master' 2025-07-03 21:23:12 -04:00
Anuken
dd289d3d08 Fixed drawItemSelection squishing things 2025-07-03 21:23:02 -04:00
1ue999
0852a61caa Read from MessageBlocks/Builds (#10981)
* Added ability to read content of messages and sensing the length of the content.

Also some bundle changes for read/write

* this commit will make mindustry unable to compile trust

* oop missed a space
2025-07-03 13:25:22 -04:00
Redstonneur1256
835c8b4a6c Text align (#10804)
* Text/ShapeText marker text alignment

* Allow `draw print` to use a dynamic align

* Highlight currently selected value when possible

* Fix alignment with newlines

* Add `lineAlign`

---------

Co-authored-by: Anuken <arnukren@gmail.com>
2025-07-02 14:04:43 -04:00
Redstonneur1256
b3050c299d Add select operation (#10798) 2025-07-02 14:02:51 -04:00
Anuken
adcbcec706 Removed redundant 'shoot' unit stance 2025-07-02 00:56:59 -04:00
Anuken
9e392c7caf Merge remote-tracking branch 'origin/master' 2025-07-01 23:23:54 -04:00
Anuken
88fc46fed2 Multiple unit stance support 2025-07-01 23:23:45 -04:00
DarkJune
a5beafc769 Removed 2 redundant checks in LExecutor.ControlI (#10980) 2025-07-01 19:40:43 -04:00
Anuken
b6195cc31e Merge remote-tracking branch 'origin/master' 2025-07-01 19:38:51 -04:00
Anuken
c035cf00dd Closes #10884 2025-07-01 19:38:44 -04:00
drikodjiqers
1a07b0daef Updated bundle_fil.properties (#10816)
* Updated bundle_fil.properties

fixed some mistakes and added some more translations

* Update bundle_fil.properties

this is a thing?
anyways added some more
2025-07-01 19:27:11 -04:00
DVD27
a61b5b0eae Update bundle_fr.properties (#10866)
* Update bundle_fr.properties

Add some translation, and fix some other

* Update bundle_fr.properties

Change label for casual

* Update bundle_fr.properties

Correct a value, seem uncomprehensible

* Apply suggestions from code review

Accept all suggestions

Co-authored-by: Phinner <62483793+phinner@users.noreply.github.com>

---------

Co-authored-by: Phinner <62483793+phinner@users.noreply.github.com>
2025-07-01 19:26:48 -04:00
Anuken
ecb3984110 Don't update drills when there is nothing to drill 2025-06-30 19:00:49 -04:00
Anuken
06fff3efac Merge branch 'SomeonesShade-balancing-payload_system' 2025-06-30 14:52:08 -04:00
Anuken
4f9fb2d7fb Merge branch 'balancing-payload_system' of https://github.com/SomeonesShade/Mindustry into SomeonesShade-balancing-payload_system 2025-06-30 14:51:58 -04:00
SomeonesShade
80740c0948 Merge branch 'master' into balancing-payload_system 2025-06-30 18:15:08 +08:00
Anuken
0234c448db Incinerator status fix 2025-06-29 19:57:12 -04:00
Anuken
97de3c52bd Merge remote-tracking branch 'origin/master' 2025-06-27 23:57:18 -04:00
Anuken
5d9f519426 Fixed #10974 2025-06-27 23:56:58 -04:00
Anuken
25d822afd2 Static wall autotile support 2025-06-27 12:09:44 -04:00
Phinner
c677b5cb17 Remove CN from servers_v7.json (#10971) 2025-06-27 12:08:03 -04:00
xem8k5
0df2289d40 Update servers_v7.json (#10970) 2025-06-27 12:07:45 -04:00
Anuken
3d5363692c wip crux floor 2025-06-26 21:25:15 -04:00
Anuken
bbc8d77386 Steam achievement for killing a unit with a mass driver 2025-06-26 20:14:42 -04:00
Agzam4
b7cb080f36 Mass driver bullets are destroyed like the blocks with items (#10969)
* Mass driver bullets explosions like the blocks

* Better code style

---------

Co-authored-by: TempUser <temp@mail>
2025-06-26 18:51:16 -04:00
Anuken
34032f63a5 Merge remote-tracking branch 'origin/master' 2025-06-25 14:47:14 -04:00
Anuken
908b0a2dc5 Fixed rare explosion damage freeze 2025-06-25 14:47:05 -04:00
Github Actions
2a47725362 Automatic bundle update 2025-06-23 18:38:08 +00:00
Anuken
9bd1c7d783 Hidden sector submission thread link button 2025-06-23 14:36:29 -04:00
Anuken
40828a9ccc Merge remote-tracking branch 'origin/master' 2025-06-23 12:19:20 -04:00
Anuken
b3cdec91b8 Fixed #10962 2025-06-23 12:19:13 -04:00
Cardillan
289889a685 Small canvas read/write fixes (#10955) 2025-06-21 21:20:43 -04:00
Anuken
d6ee68a371 Merge remote-tracking branch 'origin/master' 2025-06-21 21:18:32 -04:00
Anuken
4f04bf4b11 Fixed #10956 2025-06-21 21:18:25 -04:00
Tegas Aziz
48d09decf5 Update README.md (#10954) 2025-06-21 21:15:57 -04:00
Anuken
7447e1f2bb Fixed #10948 2025-06-19 14:21:42 -04:00
Anuken
78e5ff2636 Another possible sublimate fix 2025-06-18 21:08:11 -04:00
Anuken
f7c72e950c Illuminator rendering optimization 2025-06-18 20:11:06 -04:00
Anuken
90603561ac Merge remote-tracking branch 'origin/master' 2025-06-18 19:14:18 -04:00
Anuken
8569eed795 Closes Anuken/Mindustry-Suggestions/issues/5674 2025-06-18 19:14:10 -04:00
Redstonneur1256
b73c85ff75 Quad marker tweaks (#10787)
* Don't clamp UV on repeat textures

* Cleanup
2025-06-18 19:05:08 -04:00
The4codeblocks
0185b08ca7 canvas read/write + multiplayer overwrite bug fix (#10899)
* stuff

* Update CanvasBlock.java

* canvas read/write

* updated flag

* dispose on every possible closing condition (back/cancel/ok)

* arraycopy

* hide listener

* partial colons

* fix updated and dedupe closing

* typo?
2025-06-17 12:36:42 -04:00
Anuken
7a33de8fe3 Fixed #10942 2025-06-17 12:23:49 -04:00
Anuken
1e3b6b7524 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	gradle.properties
2025-06-17 11:20:35 -04:00
Anuken
536f4db5fe Sublimate collision fix 2025-06-17 11:20:21 -04:00
grely
2d14cd2232 Update servers_v7.json | Okay, this looks like crap. (#10941) 2025-06-16 13:27:12 -04:00
grely
7a1279fc30 Update servers_v7.json | replaced ip's (#10935)
* Update servers_v7.json | replaced ip's

* Update servers_v7.json

* Update servers_v7.json
2025-06-16 12:48:12 -04:00
Волшебник
067e24318c Update servers_v7.json (#10937)
For new servers
2025-06-15 20:23:23 -04:00
Redstonneur1256
c27eac9bed Marker outline control (#10931)
* Marker `outline` control

* Text/ShapeText marker outline
2025-06-15 15:28:20 -04:00
Anuken
1465916bed Merge remote-tracking branch 'origin/master' 2025-06-15 12:40:17 -04:00
Anuken
3cffbec92c Don't fill core with hidden items 2025-06-15 12:40:09 -04:00
Jason
d79802836c fix typo (#10934)
Signed-off-by: Jason <131086642+JasonP01@users.noreply.github.com>
2025-06-14 13:27:59 -04:00
Jason
fbf41641d3 Update servers_v7.json (#10929)
Re-added CN events server
2025-06-14 11:44:03 -04:00
Github Actions
77c4f27046 Automatic bundle update 2025-06-14 15:22:35 +00:00
Cardillan
981e954c61 Sense number of graphics operations (#10898)
* Sense number of graphics operations

* int to long
2025-06-14 11:21:18 -04:00
Anuken
96b0544261 Fixed #10927 2025-06-14 10:29:51 -04:00
Anuken
a8700ef441 Merge remote-tracking branch 'origin/master' 2025-06-13 19:02:46 -04:00
Anuken
f4e8325238 Fixed player stuck shooting in certain situations 2025-06-13 19:02:40 -04:00
Alpha
807517e828 Update servers_v7.json (#10903)
Changed domains from:
mindustry.kalpe.games
to
mv7-survival.kalpe.games
2025-06-13 18:18:50 -04:00
abcxyzDustry
339f6fcc9c Update servers_v7.json (#10924)
we negotiated with the mindustry tool programmer, and he agreed to let us merge into one until v8 is actually released, and before leading to the above agreement we used to have a separate group for our server, why did you delete it, hope you agree to approve for us
2025-06-13 18:07:44 -04:00
grely
ac1f49aeb5 Update servers_v7.json (#10893) 2025-06-13 18:07:35 -04:00
Iniquit
ef5fae289c Allow block info hotkey to also work on units (#10894)
* Allow the block info key to also work on units

* Follow code formatting guidelines
2025-06-13 18:06:14 -04:00
SomeonesShade
19d3e20328 Temporarily Invincible Missiles Quell (#10674)
* quell changes version 1 (draft)

* Quell Homing Workaround and Stat Display Working

* Quell, 16 close range instead of 19

* final color adjustment

* quell description attempt 1

* quell desc attempt 2

* e

* oop

* Added Homing to Quell Plasma Shielding

---------

Co-authored-by: EggleEgg <125359838+EggleEgg@users.noreply.github.com>
2025-06-13 18:04:09 -04:00
Anuken
a186b622f6 Merge remote-tracking branch 'origin/master' 2025-06-13 17:55:04 -04:00
Anuken
0b1399b3b1 Closes #10921 2025-06-13 17:54:55 -04:00
WhiteSpike
39ad275cb4 Included self check when disabling the redirect prompt from Landing Pad (#10925)
- If a sector had both a launch and landing pad of the same resource, when clicking "Redirect Launch Pads" to make other sectors' launch pads to send theirs to that sector, the prompt would remain enabled due to the disable check not considering self sending that same resource, making it seem it did nothing.

Implementation details:
- Refactored some variable names and code blocks for easier reading.
- Created ``canRedirectExports`` method which determines if the provided sector's launch pads can be redirected to the player's current sector. This method is used in both the button's disabled attribute and during execution of redirecting sectors.

Testing details:
- Utilized Windows instructions for compilation and running the application;
- Used save file from Steam's "v8-beta" branch;
- Selected a sector which contained both a launch and landing pad of the same resource. Before the changes, the button would remain enabled after pressing it. After the changes, the button now remains disabled (as all other sectors were already exporting to that sector).
2025-06-13 17:52:20 -04:00
Anuken
432adbd1d4 Closes Anuken/Mindustry-Suggestions/issues/5670 2025-06-13 11:55:55 -04:00
Anuken
7da5f0a6d9 Fixed #10915 2025-06-13 00:03:31 -04:00
Anuken
e5c745ee16 Generate autotiles at gradle pack time 2025-06-10 20:21:20 -04:00
Anuken
70ad6eb7d1 Autotile support for floors (untested) 2025-06-09 17:08:18 -04:00
Anuken
46099ca492 Merge remote-tracking branch 'origin/master' 2025-06-09 15:56:18 -04:00
Anuken
4469bfc4bc Bounds clamp fixes 2025-06-09 15:56:08 -04:00
KochiyaUenehaaa
f21429f3f1 display StatusDuration to one decimal place (#10908) 2025-06-08 10:26:28 -04:00
Lett
a18c5d148d Improve server control and logging of the DOS blacklist (#10904)
* Log kicks related to DOS bans

* unBlacklistDos method

Added a method to remove an IP that was blacklisted for being a potential DOS attack.

* Added a command to add/remove/list DOS bans

* Switched from spaces to a tab in the subnet-ban command

Switched from spaces to a tab in the subnet-ban command's listing function. This is better for accessibility and customizability.

* Use info(String, Object...) instead of String.format

* Fixed formatting to fit style guidelines
2025-06-07 00:13:15 -04:00
Anuken
47c19487fc Fixed #10901 2025-06-05 13:12:08 -04:00
Anuken
945f916d2c Fixed #10895 2025-06-04 13:34:39 -04:00
Anuken
c05eab2bcf Fixed #10887 2025-06-03 16:04:23 -04:00
Anuken
bcbe0890fe Fixed #10886 2025-06-03 15:40:03 -04:00
Anuken
1c3aa19fc4 Merge remote-tracking branch 'origin/master' 2025-06-03 15:37:27 -04:00
Anuken
a22e532034 Fixed #10891 2025-06-03 15:37:19 -04:00
Wxp
7076d1bf97 Fix Android loadJar (#10867)
* Fix Android loadJar

* Using another way

* Code formating

* Fix mod update
2025-06-02 14:32:24 -04:00
Anuken
18d852b5c1 Merge remote-tracking branch 'origin/master' 2025-06-02 14:30:26 -04:00
Anuken
fbc2794fde Fixed #10876 2025-06-02 14:30:19 -04:00
Github Actions
ee06e8b19f Automatic bundle update 2025-06-02 18:09:30 +00:00
Redstonneur1256
ea333a0a63 True modulo and unsigned right shift. (#10885) 2025-06-02 14:05:45 -04:00
Anuken
f924d0b533 Merge remote-tracking branch 'origin/master' 2025-06-01 23:10:15 -04:00
Anuken
2e64f7663a Fixed some issues with sector positions not migrating correctly 2025-06-01 23:10:05 -04:00
KochiyaUenehaaa
ab73305df9 building dumps faster when overdriven (#10871)
* Update Binding.java

* Update UnitCommand.java

* building dumps faster when overdriven
2025-06-01 11:58:42 -04:00
Sh1p*nfire
6c29460ade Fix randomWaveAI causing units to target untargetable blocks (#10870)
* Update Pathfinder.java

* Update FlyingAI.java
2025-06-01 11:49:03 -04:00
Iniquit
44b25d6e64 Clamp continuous laser bullet position to min zero (#10873)
This prevents the laser from moving behind the unit at the end of the animation.
2025-06-01 11:46:55 -04:00
Anuken
8991af9598 Planet generation noise tweaks 2025-05-31 18:25:18 -04:00
Anuken
7715728ea0 Merge remote-tracking branch 'origin/master' 2025-05-31 11:43:34 -04:00
Anuken
7b00d4bb1b Fixed Serpulo discontinuity 2025-05-31 11:43:25 -04:00
Iniquit
9419f85642 Allow holding the cargo pickup & dropoff key (#10859)
Allow holding down the cargo pickup & cargo drop keys to repeatedly pick up or drop off payloads. This takes effect after a short delay so that tapping to pick up or drop off individual payloads is still reliable.
2025-05-31 10:18:14 -04:00
Iniquit
33d012f9bb Display payload capacity in the HUD (#10862) 2025-05-31 01:22:06 -04:00
Anuken
556cbb4815 Fixed #10848 2025-05-31 01:21:15 -04:00
Anuken
5483c6b290 Fixed #10864 2025-05-31 01:16:53 -04:00
Anuken
39b5d51409 Fixed #10863 2025-05-30 23:43:14 -04:00
Anuken
c797974585 Serpulo light coverage update fixes 2025-05-30 16:50:22 -04:00
Anuken
cb2a235a45 Updated geothermal stronghold submission 2025-05-30 11:17:46 -04:00
Anuken
d984c924d0 arc 2025-05-29 21:12:05 -04:00
Anuken
0d483cfc91 arc 2025-05-29 21:11:56 -04:00
Anuken
82a801b1c0 Async mesh reloading for planets 2025-05-29 20:46:17 -04:00
Anuken
1e621259d5 Metal floor for Serpulo crux megabase 2025-05-29 17:39:08 -04:00
Anuken
d4d8e6d42c Light coverage based on player structures 2025-05-29 14:19:33 -04:00
Anuken
8f0ca13ace Player base emissive lights on Serpulo (WIP) 2025-05-28 23:10:45 -04:00
Anuken
43fb2e7cdc Emissive planet system upgrades / Indexed vertices for planets 2025-05-28 21:21:21 -04:00
Anuken
fcb5b42d58 WIP bases with emissive lighting on Serpulo 2025-05-28 19:04:33 -04:00
Anuken
00621dbc18 More base coverage rearrangement 2025-05-27 20:54:21 -04:00
Anuken
1bee56000d More base coverage rearrangement 2025-05-27 19:29:20 -04:00
Anuken
2419c506a4 Base coverage tweaks 2025-05-27 18:59:10 -04:00
Anuken
85302bc465 Fixed #10854 2025-05-27 13:37:23 -04:00
Anuken
519ceab0ad Merge remote-tracking branch 'origin/master' 2025-05-27 11:26:38 -04:00
Anuken
b9c224e114 Fixed #10852 2025-05-27 11:26:31 -04:00
GeoNew2011
1930b9be2a minor spelling mistake (#10849) 2025-05-26 13:34:39 -04:00
Shade
b5aa9f41d9 maxPayloadSize from 5by5 to 4by4 2025-05-26 00:48:47 +08:00
GeoNew2011
0ae40680a4 Update servers_v7.json (#10837)
erepulo hexed
2025-05-25 12:42:44 -04:00
Anuken
64305aa8b1 Merge remote-tracking branch 'origin/master' 2025-05-25 12:32:54 -04:00
Anuken
c15d8d15cb Fixed #10846 2025-05-25 12:32:47 -04:00
Shade
53c73b7259 Update Contributors
Honestly after some self reflection... I'm satisfied with what I've done
2025-05-25 22:53:20 +08:00
Shade
8c4cfe9076 Flipped Cost Between PayLoader and PayUnloader 2025-05-25 15:56:13 +08:00
Shade
112917b188 Payload Loaders now being able to chain with each other 2025-05-25 15:54:58 +08:00
Shade
8433819ffb Loader/Unloader Counterbalance
100% CB for Graphite, Silicon
Maintaining 50% CB for Tungsten
2025-05-25 14:00:27 +08:00
Shade
bf935a62ff CounterBalance: Assemblers 2025-05-25 12:25:42 +08:00
Shade
4d94c1632d Payload Adjustments 2025-05-25 12:08:11 +08:00
karlo292
0900ff8270 Update servers_v7.json (#10831)
I have renamed the server and giving ownership to Alpha182
2025-05-24 23:32:50 -04:00
50275
e0940ee31a Add log base n (#10843)
* Update LogicOp.java

* correct indentation
2025-05-24 23:21:47 -04:00
Anuken
2e46633bcd Fixed #10845 2025-05-24 23:20:54 -04:00
Anuken
ce3590dafe Merge remote-tracking branch 'origin/master' 2025-05-24 23:16:58 -04:00
Anuken
0ed6bdd611 Fixed sector tech tree not corresponding to map 2025-05-24 23:16:51 -04:00
50275
c7c4ed6bae Remove Quasar Recoil (#10842)
Currently, Quasar moves backwards whenever it shoots. I propose completely removing this recoil. 

Discussion pending. https://discord.com/channels/391020510269669376/813425645518061678/1375623453453058050
2025-05-23 20:20:46 -04:00
Anuken
91ca60e90f More decimals for RTG stats / Pathfinder crash fix in editor 2025-05-23 19:23:09 -04:00
Anuken
f063c56171 Sector icon fix (again) 2025-05-22 20:18:26 -04:00
Anuken
d2c50ccd9e Sector layout fixes 2025-05-22 19:44:45 -04:00
Anuken
0de78ffa0d Fixed #10824 2025-05-22 19:14:38 -04:00
Anuken
2436e54149 Fixed #10832 2025-05-22 19:08:14 -04:00
Anuken
717850ec8d Merge branch 'master' of https://github.com/Anuken/Mindustry 2025-05-22 19:03:39 -04:00
Anuken
9c807cb82c Remapping fixes 2025-05-22 18:55:36 -04:00
Anuken
268a87a6c0 Sector save remapping 2025-05-22 18:46:29 -04:00
Redstonneur1256
58f0087cd3 Update MapMarkers.java (#10830) 2025-05-22 18:13:21 -04:00
Anuken
6d8096ded4 Reverted unnecessary sector number changes 2025-05-21 23:24:02 -04:00
Anuken
2161dd519a Sector layout changes 2025-05-21 23:07:59 -04:00
Anuken
b64dc0badd Merge branch 'master' of https://github.com/Anuken/Mindustry into adjacent-campaign-sectors 2025-05-18 15:42:42 -04:00
Anuken
cc7c2dd79c More WIP sector tech tree changes 2025-05-18 12:12:04 -04:00
Anuken
0a046f8fa5 Don't show mining stances for wall ores when irrelevant 2025-05-17 10:33:45 -04:00
Anuken
5c96761ff6 Merge remote-tracking branch 'origin/master' 2025-05-16 14:23:57 -04:00
Anuken
11db431e95 Fixed #10812 2025-05-16 14:23:50 -04:00
ity
5bcaff0694 Update InputHandler.java (#10813) 2025-05-16 14:17:32 -04:00
Anuken
adb7264bc4 Fixed #10815 2025-05-16 14:14:09 -04:00
Anuken
913104b774 progress 2025-05-16 14:09:05 -04:00
Anuken
6e7cc551b3 Merge branch 'master' of https://github.com/Anuken/Mindustry into adjacent-campaign-sectors 2025-05-15 22:09:17 -04:00
Anuken
4abbd1a0f8 Merge remote-tracking branch 'origin/master' 2025-05-15 18:30:48 -04:00
Anuken
185ad13e49 25% flying unit wreck health / 50% flying unit crash damage 2025-05-15 18:30:40 -04:00
1ue999
f99153e2ef opround thing (#10805) 2025-05-14 13:03:12 -04:00
nuri (smol)
4e84bbc547 make launch args easily accessible (desktop) (#10802)
* make launch args easily accessible

* staticnt
2025-05-14 13:02:55 -04:00
Anuken
e1e5bd5b3f Fixed #10806 / Fixed crash 2025-05-14 12:06:35 -04:00
Anuken
8951a2698e Stricter construct checks 2025-05-14 11:19:10 -04:00
Anuken
c5f3d584f0 Fixed #10801 2025-05-14 10:29:05 -04:00
Anuken
f1390f3933 Fixed #10807 2025-05-14 10:24:15 -04:00
Anuken
3fcb24377a progress 2025-05-14 09:59:37 -04:00
Anuken
2b4c87fb22 Merge remote-tracking branch 'origin/master' 2025-05-11 21:25:53 -04:00
Anuken
9730bbd58d Sign logic op 2025-05-11 21:25:45 -04:00
Anuken
bfbc376e92 wip 2025-05-11 21:24:21 -04:00
Github Actions
c6ce5a200f Automatic bundle update 2025-05-11 14:45:04 +00:00
BalaM314
e444f40d4c Ignore colors when sorting maps (#10790) 2025-05-11 10:43:51 -04:00
Redstonneur1256
159813a7fd Logic color unpacking (#10794)
* `unpackcolor`

* Add description
2025-05-11 10:43:37 -04:00
Anuken
e6182605f4 WIP sector reorganization + loading system (broken, do not use!) 2025-05-10 23:53:30 -04:00
Anuken
d51e350d75 More attack sector tweaks 2025-05-10 21:47:46 -04:00
Anuken
f4458db076 Serpulo planet code cleanup / Fixed loading crash 2025-05-10 20:21:45 -04:00
Anuken
178ce7454b Tweaks to attack sector positions 2025-05-10 17:27:16 -04:00
Anuken
cc71da6dfe WIP base prebuild AI (not functional) 2025-05-10 15:18:27 -04:00
Anuken
23c45154a9 Possible research deselect fix / Updated map submissions 2025-05-09 22:05:02 -04:00
Anuken
af0d0be294 Fixed #10785 2025-05-09 13:23:33 -04:00
Anuken
869b3487c4 Log research dialog pointer info for debugging on mobile 2025-05-09 11:31:46 -04:00
Anuken
4761ca6c92 Merge remote-tracking branch 'origin/master' 2025-05-09 00:26:46 -04:00
Anuken
27c4210482 Debug option for editing sector attack designation 2025-05-09 00:26:37 -04:00
Cardillan
34151f13d6 Prevent setting counter to null using write instruction (#10774)
* Prevent setting counter to null using write instruction

* Reset isobj flag on counter on every instruction
2025-05-07 23:26:30 -04:00
5352114256h
0a7210417b Update servers_v7.json (#10781)
add new server address and remove invalid address
2025-05-07 23:25:53 -04:00
Anuken
648b5c4e69 Fixed #10780 2025-05-07 15:56:48 -04:00
Anuken
27a01f7326 Merge remote-tracking branch 'origin/master' 2025-05-07 15:50:23 -04:00
Anuken
9f70779830 Fixed #10779 2025-05-07 15:50:17 -04:00
Github Actions
c05af5f800 Automatic bundle update 2025-05-07 19:49:27 +00:00
Anuken
f0257790b8 Core fill items rule 2025-05-07 15:47:57 -04:00
Anuken
0d1bc2ada1 Fixed #10773 2025-05-06 23:52:43 -04:00
Anuken
1730f321e3 Fixed #10772 2025-05-06 23:38:25 -04:00
Anuken
685a52eb48 Fixed #10769 2025-05-06 10:28:34 -04:00
Anuken
f3438124b3 Merge remote-tracking branch 'origin/master' 2025-05-05 20:52:38 -04:00
Anuken
8d48c678bc Cleanup 2025-05-05 20:52:32 -04:00
Github Actions
b66f9b503b Automatic bundle update 2025-05-06 00:52:05 +00:00
Anuken
16cb530b99 Allow setting attack mode wave unit spawn position 2025-05-05 20:50:43 -04:00
Anuken
317f9878dc Fixed units not resetting to their default command 2025-05-05 12:09:58 -04:00
Anuken
31724ca88d Merge remote-tracking branch 'origin/master' 2025-05-04 23:32:38 -04:00
Anuken
4cc40ca1ac Fixed tests 2025-05-04 23:32:32 -04:00
Stormrider
a2c8ae406a added core baseparts (#10760) 2025-05-04 23:19:29 -04:00
Anuken
fff8f20745 Fixed #10759 2025-05-04 23:05:42 -04:00
Anuken
2b7a0c5231 Fixed #10761 2025-05-04 22:57:35 -04:00
Anuken
c2f4186783 Always fill enemy core with items in campaign 2025-05-04 17:10:00 -04:00
Anuken
2602ebb2ea Floor large texture tiling variant support 2025-05-04 10:49:21 -04:00
Anuken
af1df167ed Include date and build date in logs 2025-05-04 09:35:18 -04:00
Skeledragon9999
e3b38ffe48 Recompiled and refactored all modified baseparts. Added a couple new ones. (#10758) 2025-05-04 00:28:52 -04:00
Anuken
909d740b68 Added 8 hidden sectors to Serpulo (UNTESTED) 2025-05-04 00:27:51 -04:00
Anuken
9be75f03fa Merge remote-tracking branch 'origin/master' 2025-05-03 19:32:35 -04:00
Anuken
8e1bb62976 Ignore garbage files in base part folder 2025-05-03 19:32:27 -04:00
Github Actions
2309afcca6 Automatic bundle update 2025-05-03 22:55:53 +00:00
Cardillan
55b954a3d4 Closes Anuken/Mindustry-Suggestions/issues/5540 - accounts for the frame of tileable displays (#10714) 2025-05-03 18:54:48 -04:00
ity
c7b5d32d65 Improve Simplified Chinese translations (#10749)
* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties
2025-05-03 18:54:29 -04:00
kamikazevikings
8fb9f9c481 Update bundle_ja.properties (#10757)
Improved Japanese translations. Hope to improve further with imput from the Japanese community.

Co-authored-by: Anuken <arnukren@gmail.com>
2025-05-03 18:54:06 -04:00
Anuken
57f93b6112 Merge remote-tracking branch 'origin/master' 2025-05-03 15:32:42 -04:00
Anuken
123c402d07 Minor planet dialog fixes 2025-05-03 15:31:55 -04:00
Github Actions
397e190790 Automatic bundle update 2025-05-03 16:13:15 +00:00
Anuken
492fba05fd Merge remote-tracking branch 'origin/master' 2025-05-03 12:12:02 -04:00
Anuken
7fd106d7b7 Fixed post-PLT sectors not showing up in database / Fixed planets being selectable through UI elements 2025-05-03 12:11:54 -04:00
grely
5c663a0a12 Update servers_v7.json | srv records broken (#10754) 2025-05-02 11:18:06 -04:00
grely
3041c5aeab Update servers_v7.json (#10752) 2025-05-02 02:18:03 -04:00
Anuken
cb83d70cda Reduced arc turret shield damage 2025-05-02 00:05:04 -04:00
Github Actions
ba0e86d278 Automatic bundle update 2025-05-01 21:13:36 +00:00
Anuken
bbe3b6f79d Merge remote-tracking branch 'origin/master' 2025-05-01 17:12:24 -04:00
Anuken
d820557bd3 Procedural sectors on Serpulo now require a Foundation core 2025-05-01 17:12:17 -04:00
KochiyaUenehaaa
3886bd972d fixed spell (#10751)
* Update Binding.java

* Update UnitCommand.java
2025-05-01 11:57:57 -04:00
Anuken
aecc3980fd Fixed #10748 2025-05-01 10:38:48 -04:00
Anuken
1a07efd80b Do not command select logic controlled units by default 2025-05-01 10:27:47 -04:00
Anuken
5615182bc5 Tainted woods guardian reverted, tech tree position changed 2025-05-01 00:10:08 -04:00
Anuken
b2261b52df More iOS arch fixes 2025-04-30 21:54:27 -04:00
Anuken
c539a4f39b Removed outdated arch for iOS 2025-04-30 20:52:47 -04:00
703 changed files with 8604 additions and 3409 deletions

View File

@@ -18,7 +18,7 @@ See [CONTRIBUTING](CONTRIBUTING.md).
Bleeding-edge builds are generated automatically for every commit. You can see them [here](https://github.com/Anuken/MindustryBuilds/releases). Bleeding-edge builds are generated automatically for every commit. You can see them [here](https://github.com/Anuken/MindustryBuilds/releases).
If you'd rather compile on your own, follow these instructions. If you'd rather compile on your own, follow these instructions.
First, make sure you have [JDK 17](https://adoptium.net/archive.html?variant=openjdk17&jvmVariant=hotspot) installed. **Other JDK versions will not work.** Open a terminal in the Mindustry directory and run the following commands: First, make sure you have [JDK 17](https://adoptium.net/temurin/releases/?os=any&arch=any&version=17) installed. **Other JDK versions will not work.** Open a terminal in the Mindustry directory and run the following commands:
### Windows ### Windows

View File

@@ -1,37 +1,3 @@
# Note: The v7 server list is frozen. No new servers will be accepted. All v8 server PRs should be made [here](https://github.com/Anuken/MindustryServerList/blob/main/servers_v8.json). # Note: The v7 server list is frozen. No new servers will be accepted. All v8 server PRs should be made [here](https://github.com/Anuken/MindustryServerList).
*PRs to edit addresses of existing servers will still be accepted, although very infrequently.* *PRs to edit addresses of existing servers will still be accepted, although very infrequently.*
### Adding a server to the list
Mindustry now has a public list of servers that everyone can see and connect to.
This is done by letting clients `GET` a [JSON list of servers](https://github.com/Anuken/Mindustry/blob/master/servers_v7.json) in this repository.
You may want to add your server to this list. The steps for getting this done are as follows:
0. **Take note of the fact that modded servers are not allowed on this list.** Such servers confuse users, and there's currently no easy way to fix mod incompatibilities after a failed connection.
1. **Ensure your server is properly moderated.** For the most part, this applies to survival servers, but PvP servers can be affected as well.
You'll need to either hire some moderators, or make use of (currently non-existent) anti-grief and anti-curse plugins.
*Consider enabling a rate limit:* `config messageRateLimit 2` will make it so that players can only send messages every 2 seconds, for example.
2. Make sure that your server is able to handle inappropriate content - this includes NSFW display/sorter art and abusive messages. **Servers that allow such content will be removed immediately.** Consider banning display blocks if it is a problem for your server: `rules add bannedBlocks ["canvas", "logic-display", "large-logic-display"]`.
3. **Set an appropriate MOTD, name and description.** This is set with `config <name/desc/motd> <value>`. "Appropriate" means that:
- Your name or description must reflect the type of server you're hosting.
Since new players may be exposed to the server list early on, put in a phrase like "Co-op survival" or "PvP" so players know what they're getting into. Yes, this is also displayed in the server mode info text, but having extra info in the name doesn't hurt.
- Make sure players know where to refer to for server support. It should be fairly clear that the server owner is not me, but you.
- Try to be professional in your text; use common sense.
4. **Get some good maps.** *(optional, but highly recommended)*. Add some maps to your server and set the map rotation to custom-only. You can get maps from the Steam workshop by subscribing and exporting them; using the `#maps` channel on Discord is also an option.
5. **Check your server configuration.** *(optional)* I would recommend adding a message rate limit of 1 second (`config messageRateLimit 1`), and disabling connect/disconnect messages to reduce spam (`config showConnectMessages false`).
6. Finally, **submit a pull request** to add your server's IP to the list.
This should be fairly straightforward: Press the edit button on the [server file](https://github.com/Anuken/Mindustry/blob/master/servers_v7.json), then add a JSON object with the following format:
```json
{
"name": "Your Server Group Name",
"address": ["your.server.address"]
}
```
If your group has multiple servers, simply add extra addresses inside the square brackets, separated by commas. For example: `["address1", "address2"]`
> Note that Mindustry also support SRV records. This allows you to use a subdomain for your server address instead of specifying the port. For example, if you want to use `play.example.com` instead of `example.com:6000`, in the dns settings of your domain, add an SRV record with `_mindustry` as the service, `tcp` as the protocol, `play` as the target and `6000` as the port. You can also setup fallback servers by modifying the weight or priority of the record. Although SRV records are very convenient, keep in mind they are slower than regular addresses. Avoid using them in the server list, but rather as an easy way to share your server address.
Then, press the *'submit pull request'* button and I'll take a look at your server. If I have any issues with it, I'll let you know in the PR comments.

View File

@@ -73,28 +73,57 @@ public class AndroidLauncher extends AndroidApplication{
@Override @Override
public ClassLoader loadJar(Fi jar, ClassLoader parent) throws Exception{ public ClassLoader loadJar(Fi jar, ClassLoader parent) throws Exception{
//Required to load jar files in Android 14: https://developer.android.com/about/versions/14/behavior-changes-14#safer-dynamic-code-loading //Required to load jar files in Android 14: https://developer.android.com/about/versions/14/behavior-changes-14#safer-dynamic-code-loading
jar.file().setReadOnly(); try{
return new DexClassLoader(jar.file().getPath(), getFilesDir().getPath(), null, parent){ jar.file().setReadOnly();
@Override return new DexClassLoader(jar.file().getPath(), getFilesDir().getPath(), null, parent){
protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException{ @Override
//check for loaded state protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException{
Class<?> loadedClass = findLoadedClass(name); //check for loaded state
if(loadedClass == null){ Class<?> loadedClass = findLoadedClass(name);
try{ if(loadedClass == null){
//try to load own class first try{
loadedClass = findClass(name); //try to load own class first
}catch(ClassNotFoundException | NoClassDefFoundError e){ loadedClass = findClass(name);
//use parent if not found }catch(ClassNotFoundException | NoClassDefFoundError e){
return parent.loadClass(name); //use parent if not found
return parent.loadClass(name);
}
} }
}
if(resolve){ if(resolve){
resolveClass(loadedClass); resolveClass(loadedClass);
}
return loadedClass;
} }
return loadedClass; };
}catch(SecurityException e){
//`setReadOnly` to jar file in `/sdcard/Android/data/...` does not work on some Android 14 device
//But in `/data/...` it works
if(Build.VERSION.SDK_INT < VERSION_CODES.O_MR1){
throw e;
} }
};
Fi cacheDir = new Fi(getCacheDir()).child("mods");
cacheDir.mkdirs();
//long file name support
Fi modCacheDir = cacheDir.child(jar.nameWithoutExtension());
Fi modCache = modCacheDir.child(Long.toHexString(jar.lastModified()) + ".zip");
if(modCacheDir.equals(jar.parent())){
//should not reach here, just in case
throw e;
}
//Cache will be deleted when mod is removed
if(!modCache.exists() || jar.length() != modCache.length()){
modCacheDir.mkdirs();
jar.copyTo(modCache);
}
modCache.file().setReadOnly();
return loadJar(modCache, parent);
}
} }
@Override @Override

View File

@@ -1,3 +1,5 @@
import java.text.SimpleDateFormat
buildscript{ buildscript{
ext{ ext{
arcHash = property("archash") arcHash = property("archash")
@@ -115,7 +117,7 @@ allprojects{
output += name.substring("bundle".length() + 1, name.lastIndexOf('.')) + "\n" output += name.substring("bundle".length() + 1, name.lastIndexOf('.')) + "\n"
} }
new File(project(':core').projectDir, 'assets/locales').text = output new File(project(':core').projectDir, 'assets/locales').text = output
new File(project(':core').projectDir, 'assets/basepartnames').text = new File(project(':core').projectDir, 'assets/baseparts/').list().sort().join("\n") new File(project(':core').projectDir, 'assets/basepartnames').text = new File(project(':core').projectDir, 'assets/baseparts/').list().sort().findAll{f -> f.endsWith(".msch")}.join("\n")
} }
writeVersion = { writeVersion = {
@@ -137,6 +139,7 @@ allprojects{
props["number"] = versionNumber props["number"] = versionNumber
props["modifier"] = versionModifier props["modifier"] = versionModifier
props["build"] = buildid props["build"] = buildid
props["buildDate"] = new SimpleDateFormat("MMMM d, yyyy HH:mm a", Locale.getDefault()).format(new Date())
props["commitHash"] = "unknown" props["commitHash"] = "unknown"
if(project.hasProperty("showCommitHash")){ if(project.hasProperty("showCommitHash")){
props["commitHash"] = getCommitHash() props["commitHash"] = getCommitHash()
@@ -241,6 +244,7 @@ project(":desktop"){
dependencies{ dependencies{
implementation project(":core") implementation project(":core")
implementation arcModule("extensions:profiling")
implementation arcModule("extensions:discord") implementation arcModule("extensions:discord")
implementation arcModule("natives:natives-filedialogs") implementation arcModule("natives:natives-filedialogs")
implementation arcModule("natives:natives-desktop") implementation arcModule("natives:natives-desktop")

Binary file not shown.

After

Width:  |  Height:  |  Size: 173 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 246 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 173 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 225 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 202 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 101 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 175 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 227 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 205 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 174 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 298 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 201 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 186 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 102 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 174 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 165 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 237 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 167 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 249 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 243 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 194 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 105 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 191 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 267 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 234 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 172 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 145 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 178 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 161 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 362 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 187 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 208 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 85 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 83 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 170 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 72 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 107 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 84 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 100 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 84 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 156 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 159 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 92 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 93 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 167 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 173 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 208 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 106 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 200 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 74 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 153 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 179 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 156 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 125 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 75 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 311 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 99 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 89 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 183 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 118 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 77 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 262 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 192 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 105 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 105 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 161 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 91 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 542 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 181 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 760 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 266 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 251 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 198 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 548 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 121 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 214 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 196 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 165 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 211 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 253 B

Some files were not shown because too many files have changed in this diff Show More