Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,936 Commits 4 Branches 180 Tags
bd30fee404bbb58ea01c4ea5ca26db6625bf5714
Commit Graph

10838 Commits

Author SHA1 Message Date
Anuken
f683496440 cleanup 2021-10-15 17:04:34 -04:00
buthed010203
b66eb173d8 Consistency (#6163) 
* 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
176343e862 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-10-15 14:24:48 -04:00
Anuken
816ab161df Make Unit type default to Alpha 2021-10-15 12:07:07 -04:00
Anuken
9a5ac14bc3 Fixed #6158 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
56d291c963 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/content/Blocks.java
	core/src/mindustry/content/Planets.java
	core/src/mindustry/io/SaveFileReader.java
	core/src/mindustry/mod/ClassMap.java
	core/src/mindustry/type/UnitType.java
	core/src/mindustry/world/Block.java
 2021-10-14 21:00:14 -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
ef399d349c # Conflicts: 
#	core/src/mindustry/content/Blocks.java
 2021-10-14 19:17:50 -04:00
Anuken
082edbff6f Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	tools/src/mindustry/tools/Generators.java
 2021-10-14 19:15:59 -04:00
Anuken
ad1c75d050 WIP branch merging 2021-10-14 19:15:03 -04:00
Zelaux
dcb84f9faf Made the Menus API less conflicting (#6154) 
* 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 (#6150) 
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 (#6151) 
* showSectorLandInfo

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

* Add files via upload
 2021-10-14 09:50:57 -04:00
Anuken
a2f40a5565 Fixed #6148 2021-10-13 19:35:04 -04:00
Anuken
1f1a5bde3e Removed unused PayloadLaunchPad class 2021-10-13 14:00:31 -04:00
Anuken
f96700320e Removed PayloadLaunchPad 2021-10-13 13:58:47 -04:00
Anuken
4a4b336814 Added logic payEnter command 2021-10-13 10:18:34 -04:00
Anuken
d2ec511ede Bundle things 2021-10-13 09:53:52 -04:00
Matthew Peng
fdfe381b6e Unhardcode Drill Effect Randomness (#6144) 
* 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 (#5589) 
* 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 (#6129) 
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 (#6016) 
* [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 (#5984) 
* Update bundle_ko.properties

* Update bundle_ko.properties
 2021-10-12 15:21:48 -04:00
Anuken
5b9e11cc6c Revert "Update this bundle (#6081)" (#6143) 
This reverts commit 10b1ce2a3d.
 2021-10-12 15:18:56 -04:00
GuestUser25
10b1ce2a3d Update this bundle (#6081) 2021-10-12 15:18:25 -04:00
Angel-24
5b3ae4ae15 [ES] Updated spanish translation (#6031) 
* 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 (#6136) 
* Update Fx.java

* Update Fx.java

* Update Fx.java

* Update NetClient.java

* Update Fx.java
 2021-10-12 14:14:51 -04:00
Anuken
44c47586a7 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-10-12 12:36:20 -04:00
Anuken
25c8623e30 router 2021-10-12 12:35:46 -04:00
Anuken
d5f7fc842c Fixed #6140 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 (#6137) 2021-10-11 09:03:42 -04:00
Matthew Peng
4030e71b31 Customizable Force Projector Absorb Effect (#6102) 
* Customizable Force Projector Absorb Effect

* Fix everything

* Custom shield break effect
 2021-10-10 17:06:59 -04:00
Anuken
9f070323c2 a 2021-10-10 14:11:12 -04:00
Anuken
b2de197050 Merge remote-tracking branch 'origin/master' 2021-10-10 12:37:11 -04:00
Anuken
c60bd6f0dc Customizable chat formatting (Closes #5387) 2021-10-10 12:37:07 -04:00
Darkness#3729
8468214dd7 Another translate and typo fix (#6115) 
* Update bundle_ru.properties

* Another typo and some translation

* Also this

* And hint

* Bruh
 2021-10-10 10:29:58 -04:00
GlennFolker
758921c077 Added 2 versatile trigger event types (#6130) 
* t

* oops
 2021-10-10 08:08:04 -04:00
MrSampleJay
c22ede229e Update bundle_fil.properties (#6128) 
Translated item description from copper to surge
 2021-10-09 17:15:43 -04:00