mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-03-09 04:09:07 +07:00
Code Issues Packages Projects Releases Wiki Activity
9,497 Commits 4 Branches 160 Tags 2.3 GiB
006e27b61f
Commit Graph

9497 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Voz-Duh
e8cfd63bc4 Texture Fix 2020-11-01 14:12:52 +03: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
summetdev
afe3b0d111 Group for unit factory 2020-10-31 22:30:37 +03:00
Anuken
05dcd7622b Campaign tweaks 2020-10-31 14:52:03 -04:00
Anuken
9c54fcee2e Sector damage calculation fix 2020-10-31 13:42:43 -04:00
Anuken
4d34f16fcd Merge remote-tracking branch 'origin/master' 2020-10-31 13:03:22 -04:00
Anuken
2079cfaece Fixed #3208 2020-10-31 13:03:19 -04:00
Anuken
df54fb0534
Merge pull request #3209 from summetdev/database-button 
Show Core Database Button in Custom Game.
 2020-10-31 12:57:45 -04:00
summetdev
51e490e667 Core database button 2020-10-31 19:26:50 +03:00
Anuken
04fcf06ad5 Merge remote-tracking branch 'origin/master' 2020-10-31 12:03:38 -04:00
Anuken
9af8b64046 #3191 2020-10-31 12:03:35 -04:00
Anuken
dc1c132e03
Merge pull request #3207 from DeltaNedas/bullet 
fix modded bullets
 2020-10-31 11:56:35 -04:00
DeltaNedas
865beac7fb fix modded bullets 2020-10-31 15:35:45 +00:00
Anuken
13334451bf arc 2020-10-31 11:01:49 -04:00
Anuken
d68ef73407 Fixed bloom resizing improperly 2020-10-31 11:01:39 -04:00
Anuken
8d6ea6b197 Correct team display on maps 2020-10-31 10:35:21 -04:00
Anuken
2c29a06eb5 Fixed #3206 2020-10-31 10:07:01 -04:00
Anuken
b75a03aed8 Fixed #3204 2020-10-31 09:56:35 -04:00
Anuken
583e286ada Merge remote-tracking branch 'origin/master' 2020-10-31 09:01:10 -04:00
Anuken
42b8ece85a Fixed #3200 / Fixed #3196 / Fixed #3198 2020-10-31 09:01:06 -04:00
Anuken
82ee71013e
Merge pull request #3202 from TheEvilSkeleton/master 
Make the Downloads section a bit more pretty
 2020-10-31 08:55:03 -04:00
Proprietary Chrome-chan
38fad6e15f
Update README.md 2020-10-31 08:43:55 -04:00