1
0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-03-06 23:42:41 +07:00
Commit Graph

10542 Commits

Author SHA1 Message Date
Anuken
b7f030eb13 Added logic variable display window 2021-10-16 12:30:00 -04:00
Anuken
f43e308dad Merge remote-tracking branch 'origin/master' 2021-10-16 10:22:24 -04:00
Anuken
bd329f57d6 Add sensing of reconstructor config 2021-10-16 10:22:20 -04:00
Sharlotte
06bf2711a4
Update [KO] bundles once again ()
* Why did you marge this

* Update bundle_ko.properties
2021-10-16 09:49:58 -04:00
Matthew Peng
7ff9ad7351
Move payload blend check to BuildingComp () 2021-10-16 09:49:52 -04:00
Yuri Polyakov
91acda56c1
[RU] New blocks translated ()
* [RU] New blocks translated

ь

* Поправил 2 строчки

* а

* Еще перевел пару строк

* Поправил строчку

Как же плохо без очков
2021-10-16 09:49:37 -04:00
JrTRinny
0f29a01292
Update bundle_th.properties () 2021-10-16 09:46:27 -04:00
Anuken
902f3695ee amend 2021-10-16 09:03:21 -04:00
Anuken
d5e239c610 Fixed 2021-10-16 09:02:40 -04:00
Anuken
36064c63e3 Fixed 2021-10-15 22:26:52 -04:00
Anuken
4a979058c2 Crawler shootOnDeath 2021-10-15 21:40:09 -04:00
Anuken
956cbe792b Fixed 2021-10-15 18:48:59 -04:00
Anuken
e9e5fea306 Merge remote-tracking branch 'origin/master' 2021-10-15 17:04:39 -04:00
Anuken
f683496440 cleanup 2021-10-15 17:04:34 -04:00
buthed010203
b66eb173d8
Consistency ()
* Consistency

Why is this inconsistent with the portion just above it?

* C o n s i s t e n t
2021-10-15 16:07:15 -04:00
Anuken
816ab161df Make Unit type default to Alpha 2021-10-15 12:07:07 -04:00
Anuken
9a5ac14bc3 Fixed 2021-10-15 11:40:55 -04:00
Anuken
d8cf65e24c More permissive json type re-declarations 2021-10-14 21:59:02 -04:00
Anuken
3de9cfa1d7 Don't crash on invalid research 2021-10-14 21:26:34 -04:00
Anuken
df156444e7 Prioritize mod content in parser 2021-10-14 21:24:19 -04:00
Anuken
8a3dd53aa2 ClassMap regen 2021-10-14 21:01:20 -04:00
Anuken
b855849e4a Merge remote-tracking branch 'origin/master' 2021-10-14 20:58:13 -04:00
Anuken
6b59c1cd83 More branch merging 2021-10-14 20:58:03 -04:00
Anuken
ad1c75d050 WIP branch merging 2021-10-14 19:15:03 -04:00
Zelaux
dcb84f9faf
Made the Menus API less conflicting ()
* Made the Menus API less conflicting

* Fixed ignoring zero menuId in Menus
2021-10-14 14:23:12 -04:00
itsragedev
d5babe88e3
Update bundle_de.properties ()
Changing some strings to match the original a little more.
2021-10-14 11:38:25 -04:00
Sunny Kim
ec1124499f
Disable sector info for specific sectors ()
* showSectorLandInfo

* showSectorLandInfo type
2021-10-14 11:16:36 -04:00
Ilya246
095cc27ea6
Add shootOnDeath to weapons ()
* Update Weapon.java

* Add files via upload
2021-10-14 09:50:57 -04:00
Anuken
a2f40a5565 Fixed 2021-10-13 19:35:04 -04:00
Anuken
1f1a5bde3e Removed unused PayloadLaunchPad class 2021-10-13 14:00:31 -04:00
Anuken
4a4b336814 Added logic payEnter command 2021-10-13 10:18:34 -04:00
Matthew Peng
fdfe381b6e
Unhardcode Drill Effect Randomness ()
* Unhardcode Drill Effect Randomness

* I should start refusing to make prs for people
2021-10-12 22:32:58 -04:00
Anuken
9e01d1a69d Merge remote-tracking branch 'origin/master' 2021-10-12 18:25:43 -04:00
Anuken
5e8a3137c1 FX cast cleanup 2021-10-12 18:25:37 -04:00
Matthew Peng
8c3ecfdb06
Make Burst + Spread Work ()
* Make Burst + Spread Work

* This is why you use an IDE

* h
2021-10-12 17:36:59 -04:00
BorisA11
bf8276f501
Serbian translation of all blocks ()
all blocks are now translated, meaning the game should be more playable on this language
block descriptions are not yet done
2021-10-12 15:36:29 -04:00
Yuri Polyakov
1fc3974e1b
[RU] Minor translation of some lines ()
* [RU] Minor translation of some lines

Translated 3 lines. That's all for now ...

* [RU] Editor translate

bruh

* [RU] Editor translate (2)

* [RU] Editor translate

bruh2

* update

* update 2
2021-10-12 15:34:51 -04:00
Sharlotte
c857c8a438
Update bundle_ko.properties ()
* Update bundle_ko.properties

* Update bundle_ko.properties
2021-10-12 15:21:48 -04:00
Anuken
5b9e11cc6c
Revert "Update this bundle ()" ()
This reverts commit 10b1ce2a3d.
2021-10-12 15:18:56 -04:00
GuestUser25
10b1ce2a3d
Update this bundle () 2021-10-12 15:18:25 -04:00
Angel-24
5b3ae4ae15
[ES] Updated spanish translation ()
* Update bundle_es.properties

* Update bundle_es.properties

* Update bundle_es.properties

* Update bundle_es.properties

* Update bundle_es.properties

* Update bundle_es.properties

* Update bundle_es.properties

* Update bundle_es.properties

* Updated line 125

Remove suggestion of changing auto-disabling mods setting when the game crashes, just what Anuke did in the original bundle.
2021-10-12 14:16:22 -04:00
Anuken
90d589939a PR cleanup 2021-10-12 14:15:28 -04:00
Anuken
da225d15c7 Merge branch 'master' of https://github.com/Anuken/Mindustry 2021-10-12 14:14:56 -04:00
Ilya246
21549d2518
Add new fx ()
* Update Fx.java

* Update Fx.java

* Update Fx.java

* Update NetClient.java

* Update Fx.java
2021-10-12 14:14:51 -04:00
Anuken
25c8623e30 router 2021-10-12 12:35:46 -04:00
Anuken
d5f7fc842c Fixed 2021-10-12 08:25:00 -04:00
Anuken
da0fea5186 Merge remote-tracking branch 'origin/master' 2021-10-11 10:30:44 -04:00
Anuken
6abb458c27 Increased world stream chunk size 2021-10-11 10:30:40 -04:00
GlennFolker
9cc738d867
order () 2021-10-11 09:03:42 -04:00
Matthew Peng
4030e71b31
Customizable Force Projector Absorb Effect ()
* Customizable Force Projector Absorb Effect

* Fix everything

* Custom shield break effect
2021-10-10 17:06:59 -04:00