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

7715 Commits

Author SHA1 Message Date
Anuken
f96552a1a1 Merge remote-tracking branch 'origin/master' 2020-10-14 08:49:09 -04:00
Anuken
6b4a7d025b Fixed #2938 / Fixed #2936 2020-10-14 08:49:05 -04:00
Anuken
bb655100ee
Merge pull request #2865 from sk7725/patch-18 
Update bundle_ko.properties
 2020-10-13 19:38:18 -04:00
Anuken
bea9deb386 Removed planet switch debug code 2020-10-13 19:37:45 -04:00
Anuken
1554fd0394 Planet selection for mods 2020-10-13 18:50:18 -04:00
Anuken
6bfae1c34f
Merge pull request #2932 from Prosta4okua/master 
Update bundle_ru.properties
 2020-10-13 18:09:59 -04:00
Anuken
cce8b5a530 Merge remote-tracking branch 'origin/master' 2020-10-13 18:09:49 -04:00
Anuken
a8b55c27e8 x 2020-10-13 18:09:46 -04:00
Anuken
41c08a64e2
Merge pull request #2724 from Prosta4okua/patch-6 
Ukrainian localisation
 2020-10-13 18:07:35 -04:00
Felix Corvus
f846125e78
Update bundle_ru.properties 2020-10-14 01:07:32 +03:00
Anuken
caab6c1fa3
Merge pull request #2720 from Prosta4okua/master 
[Bundle][RU] actual L10n
 2020-10-13 18:06:45 -04:00
Anuken
7a770d8aed
Merge pull request #2696 from YellOw139/patch-4 
[Bundle][RO] Translation Update
 2020-10-13 18:06:31 -04:00
Anuken
77458e1e4d
Merge pull request #2694 from PetrGasparik/v106-alpha 
[v107-alpha] Czech translation - update
 2020-10-13 18:06:16 -04:00
Anuken
64cae7d877
Merge pull request #2693 from laohuaji233/patch-38 
Update bundle_zh_CN.properties(finished)
 2020-10-13 18:06:07 -04:00
Anuken
0e544825f9
Merge pull request #2481 from Pietro303HD/patch-2 
some small changes, and also removed a typo
 2020-10-13 18:03:56 -04:00
Anuken
3bf80e6732
Merge pull request #2420 from DaGamerFiles/patch-1 
Indonesian translation
 2020-10-13 18:03:47 -04:00
Felix Corvus
e612213969
Update bundle_ru.properties 2020-10-14 00:44:10 +03:00
Anuken
37bb48076d Fixed #2931 2020-10-13 17:41:47 -04:00
Summet
37cafe5081
Бета 2020-10-13 23:31:41 +03:00
Anuken
4bf2b3b43e Now in beta 2020-10-13 16:18:11 -04:00
Anuken
b1acc90739 Cleanup 2020-10-13 16:13:18 -04:00
Anuken
5d76dd0e2f Fixed #2929 2020-10-13 15:56:00 -04:00
Anuken
c05f40af4a Merge remote-tracking branch 'origin/master' 2020-10-13 10:53:50 -04:00
Anuken
b2c236fe7b Difficulty settings for sector presets 2020-10-13 10:53:40 -04:00
Anuken
d4c72b2a9c
Merge pull request #2915 from genNAowl/pierce-cap-info 
Add `pierceCap` Info
 2020-10-13 10:53:17 -04:00
Sunny Kim
4364851cf4
let buildTable accept closeSelect 2020-10-13 22:29:55 +09:00
Leonwang4234
24d295a924 add infinitepierce + bugfixes 2020-10-12 17:57:00 -07:00
Anuken
06877b457e Rule selection fixes 2020-10-12 15:59:22 -04:00
Felix Corvus
7564f93445
Merge branch 'master' into master 2020-10-12 22:11:18 +03:00
Anuken
fde1881fd5 Merge remote-tracking branch 'origin/master' 2020-10-12 14:33:29 -04:00
Anuken
876534bd26 Wave balancing & AI tweaks 2020-10-12 14:33:22 -04:00
Anuken
fbda1fb7cf
Merge pull request #2863 from MEEPofFaith/patch-2 
If units can have `chargeSound`, why not `chargeTurret`s too?
 2020-10-12 10:40:50 -04:00
Vanguard
e2403b96e6
3 changed lines 
indev.popup
block.silicon-smelter.description
block.alloy-smelter.description
 2020-10-12 17:38:56 +03:00
Summet
2a1ce6109e
Дацитовый валун (#23) 2020-10-12 17:25:13 +03:00
Vanguard
eec7408b0e
3 lines added; 1 line changed 
Added:
wave.guardianwarn
wave.guardianwarn.one
lastaccessed

Changed:
block.silicon-smelter.description
 2020-10-12 17:08:57 +03:00
Anuken
f10c5c1ca8 Merge remote-tracking branch 'origin/master' 2020-10-12 10:06:41 -04:00
Anuken
378e81cd90 Fixed #2917 2020-10-12 10:06:34 -04:00
Wiki Updater
08629bb7f7 add bundle entry for dacit boulder 2020-10-12 10:49:41 +02:00
Leonwang4234
7f5561f037 add... 2020-10-11 17:03:48 -07:00
Anuken
66ecf96be2
Merge pull request #2904 from Quezler/patch-52 
Make deconstructing scrap walls return scrap
 2020-10-11 19:11:52 -04:00
Anuken
6807b589a3 Logic unit control tweaks 2020-10-11 19:10:33 -04:00
MEEP of Faith
7662174dc4 oki doki 2020-10-11 12:58:50 -07:00
Anuken
ee50995dde Removed "sector attacked" message 2020-10-11 14:54:05 -04:00
Anuken
2f6f205dc7 Better builder detection for ConstructBlock 2020-10-11 14:20:53 -04:00
Anuken
f1ec26f82b Correct logic control position rendering 2020-10-11 14:10:55 -04:00
Anuken
7df575e76a Merge remote-tracking branch 'origin/master' 2020-10-11 14:05:19 -04:00
Anuken
af54de894c Balancing / LogicAI sync 2020-10-11 14:05:16 -04:00
YellOw139
8ed6f1e3a8
Updates until commit 3fe79531a6 2020-10-11 21:01:37 +03:00
Summet
4f258b54c5
Fix Vars.loops declaration 2020-10-11 20:47:04 +03:00
Anuken
ad2bda8ec1 Better sector gen 2020-10-11 13:33:02 -04:00