Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,268 Commits 4 Branches 180 Tags
f5888a7c56dd333f5f0a99e5669af9d500574a10
Commit Graph
9268 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken f5888a7c56 Android crash fixes v110 2020-10-23 13:42:28 -04:00
Anuken 754aba9013 Merge remote-tracking branch 'origin/master' 2020-10-23 13:31:58 -04:00
Anuken cf3f540df4 New map 2020-10-23 13:31:55 -04:00
AnukenandGitHub f2f805e140 Merge pull request #2969 from rodrigolitzius/patch-1 
S
 2020-10-23 12:01:43 -04:00
Anuken 84171a8619 Slightly better terrain filter 2020-10-23 12:00:06 -04:00
Anuken 92d573bdcb Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	core/assets/bundles/bundle_ro.properties
 2020-10-23 11:52:27 -04:00
Anuken f81f4ded03 Updated bundles 2020-10-23 11:52:01 -04:00
AnukenandGitHub c3e0a8efd7 Merge pull request #3075 from YellOw139/patch-1 
[Bundle][RO] Translation Update
 2020-10-23 11:50:57 -04:00
YellOw139andGitHub 92327bfd1d [Bundle][RO] Translation Update 
This PR was tested in-game and is ready to merge at any time (unless marked as draft).

Changelog:

- New strings/changes up to commit <need to check number>
- Typo fixes & various other improvements
 2020-10-23 18:49:48 +03:00
Anuken 7d194094ff Merge remote-tracking branch 'origin/master' 2020-10-23 11:48:56 -04:00
Anuken d8798b5a0d function 2020-10-23 11:48:53 -04:00
AnukenandGitHub 6d846cc3a5 Merge pull request #2934 from Prosta4okua/master 
[Bundle][RU] actual L10n
 2020-10-23 11:48:35 -04:00
Anuken 4dfb743273 Merged translations 2020-10-23 11:42:12 -04:00
Anuken 2b5ee5c463 Merge remote-tracking branch 'origin/master' 2020-10-23 10:39:05 -04:00
Anuken bf1268bb6e Shooting -> Function category / Dialog cleanup 2020-10-23 10:39:01 -04:00
Felix CorvusandGitHub 9cb601c569 Update bundle_ru.properties 2020-10-23 17:11:51 +03:00
Felix CorvusandGitHub bf8ab8e34e Update bundle_ru.properties 2020-10-23 16:49:43 +03:00
AnukenandGitHub 4de1b8fe11 Merge pull request #2948 from xXextremeduro69420Xx/patch-2 
Update bundle_pt_BR.properties
 2020-10-23 09:47:28 -04:00
AnukenandGitHub 9db4d287dd Merge branch 'master' into patch-2 2020-10-23 09:47:22 -04:00
AnukenandGitHub 4ca3909220 Merge pull request #3024 from DaGamerFiles/patch-2 
Update bundle_in_ID.properties
 2020-10-23 09:38:24 -04:00
AnukenandGitHub 6983577b20 Merge pull request #3006 from Kieaer/patch-5 
Update bundle_ko.properties
 2020-10-23 09:38:10 -04:00
AnukenandGitHub 7812d92915 Merge pull request #2944 from Prosta4okua/patch-7 
Ukrainian bundle
 2020-10-23 09:35:19 -04:00
AnukenandGitHub 3d46ed580e Merge branch 'master' into patch-7 2020-10-23 09:35:13 -04:00
AnukenandGitHub d7e5828347 Merge pull request #2942 from YellOw139/patch-5 
[Bundle][RO] Translation Update
 2020-10-23 09:34:40 -04:00
AnukenandGitHub fb29817a45 Merge pull request #2940 from PetrGasparik/v107 
Czech translation for v110
 2020-10-23 09:34:09 -04:00
AnukenandGitHub 2dfb9830a3 Merge branch 'master' into v107 2020-10-23 09:34:04 -04:00
AnukenandGitHub f8957b20c9 Merge pull request #2860 from BasedUser/patch-4 
Update servers_be.json
 2020-10-23 09:31:03 -04:00
AnukenandGitHub aad91cce03 Merge pull request #2826 from ActualWina/patch-7 
Updates to bundle_es.properties
 2020-10-23 09:30:27 -04:00
AnukenandGitHub a1de6e5288 Merge branch 'master' into patch-7 2020-10-23 09:30:23 -04:00
AnukenandGitHub b181eda196 Merge pull request #2822 from cinnx/patch-15 
Update bundle_pl.properties
 2020-10-23 09:28:51 -04:00
AnukenandGitHub a16b9240d6 Merge branch 'master' into patch-15 2020-10-23 09:28:47 -04:00
AnukenandGitHub e163a80ba7 Merge pull request #2748 from ballgamer56/patch-2 
Update Thai translation
 2020-10-23 09:25:05 -04:00
AnukenandGitHub a0f55861fe Merge pull request #3028 from GlennFolker/master 
allow mods to easily load icon region
 2020-10-23 09:21:43 -04:00
Anuken d66cf13ac6 Added buttons to clear campaign saves & research 2020-10-23 09:08:17 -04:00
Anuken 436a020c3e Fixed attack mode gamover check 2020-10-22 20:44:18 -04:00
Anuken 23673f0b11 typo 2020-10-22 20:34:02 -04:00
Anuken bd659d2c97 Don't clear legacy unlocks after read 2020-10-22 20:33:26 -04:00
Anuken 514e2503fa Editor generation cleanup 2020-10-22 19:26:55 -04:00
Anuken 4f21ea7799 Fixed archipelago map / filters messing with block data 2020-10-22 18:11:12 -04:00
Anuken a773edd838 (slightly) fewer polys in campaign 2020-10-22 17:12:38 -04:00
Anuken ace9aebf2b Fixed #3068 2020-10-22 16:28:08 -04:00
Anuken a2e75df096 Map editor tweaks & fixes / New map 2020-10-22 15:27:30 -04:00
Anuken c2ff5a69ef Buffered map-load filter support / Spawn path filter 2020-10-22 12:27:22 -04:00
YellOw139andGitHub f4fcb8daa6 Update bundle_ro.properties 2020-10-22 19:14:48 +03:00
Anuken 46b2f4cccb Minor bugfixes & wave tweaks 2020-10-22 11:54:27 -04:00
Felix CorvusandGitHub c63b98150f Merge branch 'master' into master 2020-10-22 18:21:52 +03:00
VanguardandGitHub 91164f659b smol breyn 2020-10-22 18:02:39 +03:00
VanguardandGitHub 70750920fa anuke shenanigans 
a lot of them
 2020-10-22 17:14:41 +03:00
Anuken a732237005 Allowed enemy spawns on water 2020-10-22 09:43:21 -04:00
YellOw139andGitHub 76d2fc0f54 Typo 2020-10-22 16:23:21 +03:00