mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-08 01:43:59 +07:00
Code Issues Packages Projects Releases Wiki Activity
14,707 Commits 4 Branches 160 Tags 2.3 GiB
cbc4c0d3b2
Commit Graph

12428 Commits

Author SHA1 Message Date
Anuken
3927841f43 Fixed #7080 2022-06-26 17:31:31 -04:00
Anuken
3f6ab92fcb Map objective editor fixes 2022-06-26 14:07:58 -04:00
Anuken
02e46a9909 Merge remote-tracking branch 'origin/master' 2022-06-26 12:10:02 -04:00
Anuken
b25ca6ff33 WIP objective marker editing + Mobile factory output tap 2022-06-26 12:09:58 -04:00
Github Actions
0698c5dd8f Automatic bundle update 2022-06-26 15:52:10 +00:00
JniTrRny
a2513493df
better generation UI (#7078) 2022-06-26 11:51:17 -04:00
Anuken
5b48faf13b ...and faster music loading 2022-06-26 09:33:26 -04:00
Anuken
d84b981d24 Faster sound loading 2022-06-26 08:35:08 -04:00
Anuken
4ae157d50f Merge remote-tracking branch 'origin/master' 2022-06-25 09:45:17 -04:00
Anuken
0ee53817d8 Fixed JSON controller crash 2022-06-25 09:45:12 -04:00
Github Actions
6f3c91c241 Automatic bundle update 2022-06-25 13:08:30 +00:00
xem8k5
2ac0c79b4f
Update bundle.properties (#7073) 2022-06-25 09:07:09 -04:00
Anuken
6db23c4d07 JSON unitType class -> template 2022-06-25 08:57:30 -04:00
Anuken
b47a8be8cf Merge remote-tracking branch 'origin/master' 2022-06-24 21:18:10 -04:00
Anuken
cc26a0eeb3 WIP objective editor progress 2022-06-24 21:18:04 -04:00
Github Actions
8b66107833 Automatic bundle update 2022-06-24 00:58:28 +00:00
Anuken
be61b45d08 WIP point laser turret 2022-06-23 20:57:22 -04:00
Anuken
ac47d22ea1 Map resize dialog shift options 2022-06-23 17:10:44 -04:00
Anuken
d4a33c6d51 Homing bullet targeting fix 2022-06-23 17:00:24 -04:00
Anuken
e682a0f1d3 WIP/unfinished map 2022-06-23 16:55:16 -04:00
Anuken
a39fe2cb37 WIP map info dialog changes 2022-06-23 16:32:37 -04:00
Anuken
342a7abf9b Misc tweaks 2022-06-23 14:55:08 -04:00
Anuken
4ba5be8d31 Misc improvements / Latum death unit spawning 2022-06-23 13:16:25 -04:00
Anuken
226d0a9f32 Merge remote-tracking branch 'origin/master' 2022-06-22 18:31:04 -04:00
Anuken
1a98a66f23 Batched building health update packet 2022-06-22 18:30:59 -04:00
Github Actions
54c4859e92 Automatic bundle update 2022-06-22 18:20:29 +00:00
xem8k5
53f4bf7b78
Update bundle_zh_CN.properties by lastcommanded and so on (#7036) 
* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties
 2022-06-22 14:19:07 -04:00
Anuken
2de706cc6d Fixed #7058 2022-06-22 10:33:06 -04:00
Anuken
fdc7f0468f Fixed #7057 2022-06-22 10:26:32 -04:00
Anuken
76735b01f7 Somewhat more dangerous neoplasm 2022-06-22 03:25:35 -04:00
Anuken
8ed878b1b3 Aligned reconstructor unit labels 2022-06-21 10:49:30 -04:00
Anuken
e47af0c33f WIP/unfinished turret sprites 2022-06-21 10:03:38 -04:00
Anuken
1a47384ac6 Merge remote-tracking branch 'origin/master' 2022-06-20 20:22:15 -04:00
Anuken
900aa12a3c Misc minor fixes 2022-06-20 20:22:11 -04:00
Github Actions
2f45ec7c90 Automatic bundle update 2022-06-20 23:37:58 +00:00
MEEPofFaith
59b7cddd7d
Module tier stat display (#7054) 2022-06-20 19:36:52 -04:00
Damian
85ddd2764b
Name updates, block name changes and some corrections. (#7044) 
* Name updates, block name changes and some corrections.

* More corrections.

* Corrections, followed by original bundle.properties

Item descriptions, some other descriptions, and I think some errors in translating
 2022-06-19 15:10:40 -04:00
buthed010203
934688d204
Fix docs (#7047) 
* Fix docs

~~If you're gonna update them, at least fix the numbers and ordering smh~~

* Reorder for consistency

* actual correct order :/
 2022-06-19 11:13:55 -04:00
Github Actions
3137ec09e3 Automatic bundle update 2022-06-19 14:58:55 +00:00
Goobrr
625f7e9936
LStatement categories + improved UI (#7046) 
* LStatement categories + improved UI

Co-authored-by: code-explorer786 <68312688+code-explorer786@users.noreply.github.com>

* annihilate LStatement#color

Co-authored-by: code-explorer786 <68312688+code-explorer786@users.noreply.github.com>
 2022-06-19 10:57:49 -04:00
1stvaliduser
a30f6325d4
bundle_uk_UA.properties(corrections) (#7045) 
* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties
 2022-06-19 09:14:00 -04:00
Anuken
a8a2b9f684 Impact cryo requirement fix 2022-06-19 00:22:06 -04:00
Anuken
077ee978f6 Merge remote-tracking branch 'origin/master' 2022-06-18 16:07:08 -04:00
Anuken
031af7c432 UnitType death handling 2022-06-18 16:07:04 -04:00
RTOmega
b59e519e0d
TR Translate (#7043) 
* TR Translate

* Update bundle_tr.properties

* Update bundle_tr.properties

* Update bundle_tr.properties
 2022-06-18 12:56:56 -04:00
Github Actions
8f8ffd1aeb Automatic bundle update 2022-06-18 14:16:59 +00:00
Prosta4okua
54eabee103
Update bundle_uk_UA.properties (#7042) 
* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties
 2022-06-18 10:15:56 -04:00
Ilya246
41af17e70b
a (#7038) 2022-06-18 08:34:12 -04:00
Github Actions
58e274b29f Automatic bundle update 2022-06-17 22:20:30 +00:00
Ilya246
99f55ae64c
More info on unit control responsibility (#7016) 
* do

* net.active()
 2022-06-17 18:19:17 -04:00
Anuken
c5fdd34eb7 Fixed cryofluid mixer titanium input 2022-06-17 14:14:12 -04:00
Anuken
3856b154bb Merge remote-tracking branch 'origin/master' 2022-06-17 08:52:03 -04:00
Anuken
6409a96e45 Fixed #7033 2022-06-17 08:51:58 -04:00
smol
1438f7e5cd
ShapePart hollow + stroke + strokeTo (#7005) 
* hollow + stroke + strokeTo

* oops
 2022-06-16 22:36:03 -04:00
Anuken
55e03635c6 Merge remote-tracking branch 'origin/master' 2022-06-16 20:02:24 -04:00
Anuken
02f40d1e29 WIP shielded wall 2022-06-16 20:02:15 -04:00
Github Actions
4c3ee57ce9 Automatic bundle update 2022-06-16 19:38:22 +00:00
Angel-24
355ad39a7e
[ES] bundle_es.properties quality fixes (#6868) 
* Update bundle_es.properties

* Update contributors

* Update bundle_es.properties

* "Plano"/"Plantilla" → "Esquema"

* Improved "splash damage" string

* Plasma bore → "Perforador de plasma"

* World processor → "Procesador integrado"

The "world processor" and "world memory cell" are blocks initially placed as a part of the map. Using the word "integrado" instead of "global" fits better for these blocks, indicating that this block is built within the map by default.

* Update bundle_es.properties

Enable Console, VSync, and audio volume options.
 2022-06-16 15:37:19 -04:00
Github Actions
6db20908b3 Automatic bundle update 2022-06-16 19:35:33 +00:00
Anuken
2109a25e3e Turret progress 2022-06-16 15:34:22 -04:00
Anuken
52b5ed57bf Unfinished/WIP turret 2022-06-16 13:46:20 -04:00
Anuken
9807974de3 Merge remote-tracking branch 'origin/master' 2022-06-16 11:22:10 -04:00
Anuken
7cc064d14f Fixed black conduit regions 2022-06-16 11:22:05 -04:00
ErrorInCode
2db1429644
fix missing StatUnit (#7027) 2022-06-16 09:26:54 -04:00
Lucky Clover
19e213f19b
make UnitAssembler affected by rules.unitBuildSpeed (#7023) 2022-06-15 10:25:10 -04:00
Anuken
fbadda40f6 Merge remote-tracking branch 'origin/master' 2022-06-15 08:10:10 -04:00
Anuken
43cac0bd1e Fixed #7022 2022-06-15 08:10:06 -04:00
MEEPofFaith
4fca366fcd
Make OverdriveBuild fields public (#7018) 2022-06-15 07:35:44 -04:00
Goobrr
e8aa787f1f
Unit plan UI (#7021) 2022-06-15 07:35:34 -04:00
MEEPofFaith
d3f2fffa03
non-suppressable blocks shouldn't be heal suppressed (#7019) 2022-06-15 07:34:58 -04:00
Anuken
bdb199c5e7 Merge remote-tracking branch 'origin/master' 2022-06-15 07:29:36 -04:00
Anuken
3cacff6550 Fixed #7020 2022-06-15 07:29:32 -04:00
xem8k5
d3e5a139e3
Update bundle_zh_CN.properties (#7017) 2022-06-14 22:40:22 -04:00
Anuken
caed77bac2 Crash fix 2022-06-14 11:26:22 -04:00
Anuken
122c7654e5 Possible fix for double turret outline 2022-06-14 11:22:45 -04:00
Anuken
1af75baa41 Merge remote-tracking branch 'origin/master' 2022-06-14 10:55:01 -04:00
Anuken
697df9d9f1 Double outline check 2022-06-14 10:54:56 -04:00
Somka000
33cd7c0bf4
Update (#7004) 2022-06-14 10:26:31 -04:00
First Creator
c1317a787d
(update bundle_fil.properties) when will anuken merge this lol (#6992) 
* we goin perhaps

UwU~

* more i guess

* Update bundle_fil.properties
 2022-06-14 08:27:52 -04:00
Github Actions
472da6f1b5 Automatic bundle update 2022-06-14 12:20:04 +00:00
Tegas Aziz
1469b96db7
[ID] Bundle updates (#7015) 
* [ID[ Bundle updates

* unicode on initerror
 2022-06-14 08:18:42 -04:00
Anuken
ce27388fad Misc bugfixes 2022-06-13 23:23:45 -04:00
Anuken
f5b38ccbba Merge remote-tracking branch 'origin/master' 2022-06-13 21:42:16 -04:00
Anuken
2134762ed1 More world processor privileges 2022-06-13 21:42:10 -04:00
Github Actions
22c5002931 Automatic bundle update 2022-06-14 01:10:07 +00:00
Ilya246
dc5b184d45
Add a solar panel output multiplier (#7013) 
* do

* world processor compatibility

* useless
 2022-06-13 21:09:06 -04:00
Ilya246
58bfd0e46c
add thing (#7012) 2022-06-13 20:49:13 -04:00
Anuken
7b1d36a40a Fixed #7011 2022-06-13 20:48:10 -04:00
Anuken
3c26ad3ec7 Duct router save loading bugfix 2022-06-13 00:18:58 -04:00
Anuken
b87a3ebd88 Merge remote-tracking branch 'origin/master' 2022-06-12 23:04:32 -04:00
Anuken
0dface7cc1 Misc preparations for unified packing 2022-06-12 23:04:26 -04:00
router
1e536622a2
format infinities (#7009) 
* format infinities

* 🤨
 2022-06-12 22:47:08 -04:00
Anuken
1a63a2726e well, that didn't work. 2022-06-12 13:22:54 -04:00
Anuken
8267376d32 Experimental test for atlas OOM 2022-06-12 13:11:20 -04:00
Anuken
8f4a5c3572 Some minor IO null checks 2022-06-12 09:22:06 -04:00
Anuken
42d7ca9e0d Merge remote-tracking branch 'origin/master' 2022-06-11 11:20:20 -04:00
Anuken
523f94db98 liquid type support? 2022-06-11 11:20:15 -04:00
xem8k5
2c197aae7c
Update bundle_zh_CN.properties again (#7001) 
* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties
 2022-06-11 08:17:10 -04:00
Anuken
4c8471c4a7 Fixed #7002 2022-06-10 17:31:27 -04:00
Anuken
8d27d70bc2 Merge remote-tracking branch 'origin/master' 2022-06-10 08:34:43 -04:00
Anuken
8418a00483 Misc bugfixes 2022-06-10 08:34:38 -04:00
Github Actions
0a96aedc22 Automatic bundle update 2022-06-09 18:34:03 +00:00
Jerzozwierz
e9bf756165
Update pl (#6853) 
Some changes in translation so it sounds better, also few things translated

Co-authored-by: Anuken <arnukren@gmail.com>
 2022-06-09 14:33:07 -04:00
Github Actions
856a4dd218 Automatic bundle update 2022-06-09 18:31:39 +00:00
彭瑞暄
a618782345
Update zh-TW bundle translations (#6877) 
* formatting and minor changes

* Corrections

* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties

Clean-up logic-op translations

Co-authored-by: Simba-Fs 陳宏彰 <39305460+simba-fs@users.noreply.github.com>
Co-authored-by: Anuken <arnukren@gmail.com>
 2022-06-09 14:30:43 -04:00
Thomas Widyantoko
fb6e44d9e4
another v7 id_ID bundle update (#6837) 
* another v7 id_ID bundle update

Untranslated strings at line 1744-1754 and 2000-2003. Ambiguous strings at line 1170 and 1638. Fixed several typos, capitalizations and word choices.

* more id_ID v7 translation

untranslated strings at line 1744-1754
line 1942, Grafitik -> Grafit
line 1995-1997 erekir cores
 2022-06-09 14:30:03 -04:00
Anuken
4c5850ae96 Merge remote-tracking branch 'origin/master' 2022-06-09 13:16:39 -04:00
Anuken
1b5e49bd3c Items/liquids consume shorthand 2022-06-09 13:16:34 -04:00
JniTrRny
b199379e1d
4x4 map grid (#6929) 2022-06-09 12:38:19 -04:00
Anuken
dc6617cfad Threads update 2022-06-09 09:52:44 -04:00
Anuken
1920e4399b Possible crash fix 2022-06-08 16:27:47 -04:00
Anuken
c56666b104 Removed inaccessible planets from generate dialog 2022-06-08 16:07:44 -04:00
Anuken
5bf3155272 Fixed #6996 2022-06-08 15:47:04 -04:00
Anuken
67f6ca3d5d Merge remote-tracking branch 'origin/master' 2022-06-08 12:41:23 -04:00
Anuken
9ed5491d6a More payload router fixes 2022-06-08 12:41:20 -04:00
Rex
104e65a868
Update contributors (#6856) 
At a request
 2022-06-08 11:38:23 -04:00
MEEPofFaith
512d4232dd
getCategories() (#6905) 
~~There is no reason to ask why I need this.~~
 2022-06-08 11:23:19 -04:00
Github Actions
a18af7de64 Automatic bundle update 2022-06-08 15:20:55 +00:00
KayAyeAre
4646db8194
thai translation for v7 (#6927) 
* translations part 1

* translations part 2
 2022-06-08 11:18:49 -04:00
Anuken
c1549c78f0 Fixed #6883 2022-06-08 11:12:59 -04:00
Anuken
b0c4486b7c Fixed #6874 2022-06-08 11:01:28 -04:00
Anuken
ab90270917 Fixed #6980 2022-06-08 10:50:14 -04:00
Github Actions
5ccc7d44db Automatic bundle update 2022-06-08 14:36:04 +00:00
Anuken
13ac6e0331 Made console a setting 2022-06-08 10:35:00 -04:00
Anuken
62c2d9d606 Fixed #6941 2022-06-08 10:12:53 -04:00
Anuken
0bcaa002ea Fixed #6952 2022-06-08 10:08:59 -04:00
Anuken
a4c0441961 Fixed #6864 2022-06-08 10:07:12 -04:00
Anuken
966a93ddfa Fixed #6930 (probably) 2022-06-08 10:00:32 -04:00
Anuken
abb0078be3 Fixed #6993 2022-06-08 09:57:40 -04:00
Anuken
1f4b0e7f5c Fixed #6917 2022-06-08 09:44:38 -04:00
Anuken
c969749163 Fixed #6898 2022-06-08 09:43:42 -04:00
Anuken
df082c39a3 Fixed #6865 / Fixed headless canvas crash 2022-06-08 09:36:08 -04:00
Anuken
6989a81e03 Fixed #6984 2022-06-08 09:30:30 -04:00
Anuken
eb6c0ebfb5 Merge remote-tracking branch 'origin/master' 2022-06-08 09:27:25 -04:00
Anuken
28150d8f51 Fixed #6985 2022-06-08 09:27:20 -04:00
SoMall-dumpling
8bf2ffc3fc
tank. (#6860) 
* .

.

* actually

tank

* another.

.................................
 2022-06-08 09:22:46 -04:00
xem8k5
f8de42d111
Update contributors (#6866) 
Co-authored-by: Anuken <arnukren@gmail.com>
 2022-06-08 09:22:35 -04:00
Github Actions
642f1f74af Automatic bundle update 2022-06-08 13:21:24 +00:00
BlueWolf
38b0a664f4
so i made a slag heater (#6925) 
* Add slag fueled heater

* i have no idea why i have to do this but i do

Co-authored-by: Blue <415bluewolf@gmail.com>
Co-authored-by: Anuken <arnukren@gmail.com>
 2022-06-08 09:20:35 -04:00
MEEPofFaith
5cc314672f
canWithdraw() + changes to displayable() (#6902) 
* `shouldDiplay()` + `canWithdraw()`

* Better implementation of `displayable()`
 2022-06-08 09:17:30 -04:00
MEEPofFaith
968651d9ed
Charge Progress (#6947) 2022-06-08 09:13:11 -04:00
Anuken
4a6600b94d Merge remote-tracking branch 'origin/master' 2022-06-08 09:11:04 -04:00
Anuken
cbfb621179 Better implementation of #6959 2022-06-08 09:11:00 -04:00
Github Actions
bcbfde106d Automatic bundle update 2022-06-08 13:09:24 +00:00
Nunting
d3924dc0ae
Update bundle_ko.properties (#6848) 
* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

Co-authored-by: Anuken <arnukren@gmail.com>
 2022-06-08 09:08:28 -04:00
Github Actions
17bb8738cc Automatic bundle update 2022-06-08 13:06:22 +00:00
Anuken
0793ba45b5 Merge remote-tracking branch 'origin/master' 2022-06-08 09:05:31 -04:00
Anuken
b2353eba58 Misc 2022-06-08 09:05:25 -04:00
ErrorInCode
49c9841c87
Add Reinforced Surge Wall Names (#6873) 
* Added Reinforced Surge Wall Names

* i am not worthy
 2022-06-08 09:05:12 -04:00
ErrorInCode
1b9089aa30
Stats for New Blocks (#6913) 
* Stats added

* Fix bug + add WallCrafter speed

* Add more stats

* Update contributors
 2022-06-08 09:03:37 -04:00