mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-11 15:48:07 +07:00
Code Issues Packages Projects Releases Wiki Activity
9,585 Commits 4 Branches 160 Tags 2.1 GiB
17b09fbd51
Commit Graph

9585 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken
4a79f2fb4d arc 2020-11-02 22:43:12 -05:00
Skat
6bf23a9056
Server is now only 6.0 2020-11-03 06:12:16 +03:00
Anuken
5d2e705923 asfehioafuhioaghuoytgfctyr 2020-11-02 20:54:39 -05:00
Anuken
65ab869468 Added button to export crash logs 2020-11-02 19:45:45 -05:00
Anuken
8ecbb46303 changelog 2020-11-02 18:35:28 -05:00
Anuken
8f417ef2d7
Merge pull request #3241 from Alstin112/patch-3 
Update bundle_pt_BR.properties
 2020-11-02 18:10:21 -05:00
Anuken
8b4014876e
Merge pull request #3229 from skykatik/patch-4 
Cleanup and code formatting
 2020-11-02 17:59:49 -05:00
Anuken
75d8d4f407
Merge pull request #3226 from Virtox/patch-1 
Some fixes and additions for NL language file
 2020-11-02 17:58:31 -05:00
Anuken
5aef551bd2
Merge pull request #3195 from QmelZ/master 
Turkish translation and some fixes
 2020-11-02 17:58:14 -05:00
Anuken
efcd84735d
Merge pull request #3190 from TheJaaju/patch-5 
Update bundle_fi.properties
 2020-11-02 17:58:00 -05:00
Anuken
edef90da58
Merge pull request #3177 from PetrGasparik/v112 
Czech translation for latest version
 2020-11-02 17:57:46 -05:00
Anuken
534cfcfdaf
Merge pull request #3134 from L0615T1C5-216AC-9437/patch-1 
Add Chaotic Neutral to the V6 Server list
 2020-11-02 17:55:55 -05:00
Anuken
fa42dc9e17
Merge pull request #3113 from YellOw139/patch-2 
[Bundle][RO] Translation Update
 2020-11-02 17:54:54 -05:00
Anuken
9779478fe7
Merge pull request #3111 from laohuaji233/patch-40 
Update bundle_zh_CN.properties
 2020-11-02 17:54:41 -05:00
Anuken
3a4e939dee
Merge pull request #3110 from Catchears/german-v6 
Improve german translation for v6
 2020-11-02 17:54:30 -05:00
Anuken
006e27b61f
Merge pull request #3109 from Prosta4okua/patch-7 
[Bundle][Uk_ua] Update Ukrainian bundle.
 2020-11-02 17:53:55 -05:00
Anuken
544678009a
Merge pull request #3092 from Prosta4okua/master 
[Bundle][RU] actual L10n
 2020-11-02 17:53:42 -05:00
Anuken
aa81805f19
Merge pull request #3103 from MEEPofFaith/patch-1 
[Modding] Custom Base Support
 2020-11-02 17:53:14 -05:00
Anuken
51fa2bf30c blast should be after pyratite 2020-11-02 16:50:50 -05:00
Anuken
d035a3925b arc 2020-11-02 16:49:46 -05:00
Anuken
304f5b62b3 Sprites repacked 2020-11-02 16:49:24 -05:00
Anuken
e853ed6419 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	core/src/mindustry/logic/LCanvas.java
 2020-11-02 16:47:33 -05:00
Anuken
8f53d44278 Various fixes 2020-11-02 16:46:11 -05:00
Anuken
075b7d7dc6
Merge pull request #3225 from Voz-Duh/new-texture-for-blast-mixer 
New Texture For Blast Mixer
 2020-11-02 15:31:43 -05:00
Voz-Duh
cda8a9b3e9 Texture Fix 2020-11-02 23:02:56 +03:00
Voz-Duh
6e2f097803 Texture Fix 2020-11-02 22:16:46 +03:00
Alstin112
4f46486a14
Update bundle_pt_BR.properties 2020-11-01 22:17:18 -03:00
Anuken
f44cad4c08
Merge pull request #3230 from Quentinchampenois/translation/fr_keys 
Translates few keys in french
 2020-11-01 20:11:41 -05:00
Anuken
9adb3af430
Merge pull request #3239 from DeltaNedas/logicerr 
properly log logic build errors
 2020-11-01 19:16:41 -05:00
DeltaNedas
fc94d68e10 remove redundant stack trace 2020-11-01 23:16:41 +00:00
DeltaNedas
47844e0204 properly log logic build errors 2020-11-01 23:01:18 +00:00
Anuken
082d157c86
Merge pull request #3236 from DeltaNedas/publiclogic 
make logic stuff public and clean up
 2020-11-01 15:18:36 -05:00
DeltaNedas
1f9ed90cc0 remove unused DataType.java 2020-11-01 19:35:46 +00:00
DeltaNedas
cda6a6973d make logic stuff public, cleanup 2020-11-01 19:35:22 +00:00
Anuken
a13f7f633e Fixed serverside error 2020-11-01 10:42:16 -05:00
Anuken
d786c8668e Fixed logic config() called in clients / JSON-compatible effects 2020-11-01 10:30:30 -05:00
Anuken
187cb79265 Fixed #3222 / Fixed #3218 / Fixed #3228 / Fixed #3217 2020-11-01 09:28:03 -05:00
quentinchampenois
692c4733e8
light translations from english to french keys 2020-11-01 14:11:09 +01:00
Skat
ab604ec1c0
Update BaseProcessor.java 2020-11-01 16:04:30 +03:00
Skat
801251e1a6
Cleanup and code formatting 2020-11-01 15:59:43 +03:00
Voz-Duh
e8cfd63bc4 Texture Fix 2020-11-01 14:12:52 +03:00
Stijn van der Linden
e778f1ab5d
Update bundle_nl.properties 2020-11-01 11:45:13 +01:00
Stijn van der Linden
5f1d048eea
Update bundle_nl.properties 
Fixed some typo's, added couple more translated lines.
 2020-11-01 11:37:11 +01:00
Voz-Duh
3e03c3e49b New Texture For Blast Mixer 2020-11-01 13:27:09 +03:00
Anuken
54ba4b31a1 Fixed casing eject effects 2020-10-31 20:19:24 -04:00
Anuken
b5e2812d0b Bugfixes 2020-10-31 16:25:50 -04:00
Anuken
95c444a004 Merge remote-tracking branch 'origin/master' 2020-10-31 16:11:54 -04:00
Anuken
b1b03a7503 Extra legacy block substitution / iOS fixes 2020-10-31 16:11:51 -04:00
Anuken
440c035367
Merge pull request #3215 from summetdev/groups/unit-factory 
[QoL] Add Unit Factories to the Common Block Group.
 2020-10-31 16:11:28 -04:00
summetdev
e6f60505e6 Add group to UnitBlock 2020-10-31 23:03:25 +03:00