Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,621 Commits 4 Branches 180 Tags
fe27ac6aeca1709acadf13976910711fbabd1636
Commit Graph
3803 Commits
Author SHA1 Message Date
AnukenandGitHub f2f805e140 Merge pull request #2969 from rodrigolitzius/patch-1 
S
 2020-10-23 12:01:43 -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
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 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 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 2dfb9830a3 Merge branch 'master' into v107 2020-10-23 09:34:04 -04:00
AnukenandGitHub a1de6e5288 Merge branch 'master' into patch-7 2020-10-23 09:30:23 -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
Anuken d66cf13ac6 Added buttons to clear campaign saves & research 2020-10-23 09:08:17 -04:00
Anuken 4f21ea7799 Fixed archipelago map / filters messing with block data 2020-10-22 18:11:12 -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
YellOw139andGitHub 76d2fc0f54 Typo 2020-10-22 16:23:21 +03:00
YellOw139andGitHub 4d28b5083c Quezler Status Fielded my mind 2020-10-22 14:27:56 +03:00
YellOw139andGitHub dabdf514d6 Space 2020-10-22 07:50:35 +03:00
Anuken f0d74e2705 New map / Unit stat tweaks / FileChooser keyboard input 2020-10-21 20:32:35 -04:00
YellOw139andGitHub 21022436e8 Stats are finally consistent and up to date 2020-10-21 22:02:24 +03:00
Anuken a80d0cc457 Fixed #3053 2020-10-21 14:10:28 -04:00
Volas171andGitHub dec9e8d4aa Merge branch 'master' into patch-1 2020-10-21 10:53:20 -05:00
AnukenandGitHub 48f5be6623 Merge pull request #3051 from skykatik/patch-1 
var -> let
 2020-10-21 10:48:22 -04:00
Anuken ee8f18796e Merge remote-tracking branch 'origin/master' 2020-10-21 10:37:07 -04:00
Anuken 3517da8214 Fixed #3049 2020-10-21 10:37:03 -04:00
SkatandGitHub aba001f499 var deprecated, use let or const 2020-10-21 16:05:36 +03:00
키에르andGitHub f3f5872159 Merge branch 'master' into patch-5 2020-10-21 20:14:40 +09:00
YellOw139andGitHub eba9578a0d More conflict changes. Should be ok now. 2020-10-21 07:30:18 +03:00
YellOw139andGitHub b95bf1595b Fog 2020-10-21 07:28:27 +03:00
YellOw139andGitHub 92b8981988 Merge branch 'master' into patch-5 2020-10-21 07:22:51 +03:00
YellOw139andGitHub 83c53a541a Wall stats (WIP) 2020-10-21 07:10:48 +03:00
Leonwang4234 54fd2e03b4 resolve conflicts 2020-10-20 15:57:48 -07:00
Leonwang4234 df37ce3cef Merge remote-tracking branch 'upstream/master' into wall-stats 2020-10-20 15:49:46 -07:00
Anuken 18e6a43a87 Added weather to some built-in maps 2020-10-20 17:24:51 -04:00
Anuken 8f58228317 More base parts 2020-10-20 15:43:06 -04:00