mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-10 23:28:52 +07:00
Code Issues Packages Projects Releases Wiki Activity
9,302 Commits 4 Branches 160 Tags 2.1 GiB
79ace277ed
Commit Graph

7937 Commits

Author SHA1 Message Date
Anuken
79ace277ed Merge remote-tracking branch 'origin/master' 2020-10-24 15:55:25 -04:00
Anuken
bc035f9490 Fixed #3095 2020-10-24 15:55:20 -04:00
Anuken
ee7bdbf44e
Merge pull request #3081 from genNAowl/standardize-liquid-stats 
Remove timePeriod in LiquidBaseValue
 2020-10-24 15:18:47 -04:00
Anuken
b611726c3e Merge remote-tracking branch 'origin/master' 2020-10-24 15:11:31 -04:00
Anuken
819686e812 Unit factory production list 2020-10-24 15:11:27 -04:00
DeltaNedas
3b2669fa21
pattern variables? 2020-10-24 17:23:54 +00:00
DeltaNedas
801ff1701e
silly 2020-10-24 17:19:50 +00:00
DeltaNedas
364a2b43c2
add Content fallback 2020-10-24 17:04:58 +00:00
DeltaNedas
279d898d68
add more info to print object 2020-10-24 16:37:55 +00:00
Anuken
a930b34c3e
Merge pull request #3090 from QmelZ/master 
Turkish Translation
 2020-10-24 11:58:21 -04:00
QmelZ
232a3dfe87
one last little fix 2020-10-24 17:28:10 +03:00
Anuken
ddbca62f92 Merge remote-tracking branch 'origin/master' 2020-10-24 10:22:04 -04:00
Anuken
646b022d38 Bugfixes 2020-10-24 10:21:57 -04:00
QmelZ
19ef414e5c
even more fixes 2020-10-24 17:18:56 +03:00
QmelZ
f46eb24615
some other fixes 2020-10-24 17:07:52 +03:00
Anuken
4e6faf3bac
Merge pull request #3083 from genNAowl/titanium-ammo-fuse 
Switch places of titanium and thorium ammo in `Blocks.java`
 2020-10-24 09:47:21 -04:00
Anuken
56acbcecfd
Merge branch 'master' into patch-5 2020-10-24 09:46:02 -04:00
QmelZ
7d0952d858
small fix 2020-10-24 15:59:28 +03:00
QmelZ
ef40a2e78e
Update bundle_tr.properties 2020-10-24 15:56:51 +03:00
Leonwang4234
f2a984f3e7 Lets hope this compiles because I don't have time to test it 2020-10-23 19:53:21 -07:00
Anuken
1ffa3f21f0 (2) 2020-10-23 20:41:32 -04:00
Anuken
7e323f1ebf Logic locate fix 2020-10-23 20:38:33 -04:00
SilentOwl476
bff79d7c27
Update bundle_tr.properties 2020-10-24 01:46:02 +03:00
Anuken
117f002545 Fixed #3082 2020-10-23 18:24:18 -04:00
Anuken
953c1889b5 Fixed #3080 2020-10-23 17:18:49 -04:00
Leonwang4234
cc024a0bac remove timePeriod in LiquidBaseValue 2020-10-23 13:34:07 -07:00
Anuken
42bfab6e40 Fixed #3079 2020-10-23 16:12:36 -04:00
Anuken
c8ef7ebafb Fixed #3078 + action listeners for player control events 2020-10-23 15:59:52 -04:00
Anuken
5512c1817d Extra scrap for debris field map 2020-10-23 14:09:05 -04:00
Anuken
f5888a7c56 Android crash fixes 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
Anuken
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
YellOw139
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
Anuken
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 Corvus
9cb601c569
Update bundle_ru.properties 2020-10-23 17:11:51 +03:00
Felix Corvus
bf8ab8e34e
Update bundle_ru.properties 2020-10-23 16:49:43 +03:00
Anuken
9db4d287dd
Merge branch 'master' into patch-2 2020-10-23 09:47:22 -04:00
Anuken
4ca3909220
Merge pull request #3024 from DaGamerFiles/patch-2 
Update bundle_in_ID.properties
 2020-10-23 09:38:24 -04:00
Anuken
6983577b20
Merge pull request #3006 from Kieaer/patch-5 
Update bundle_ko.properties
 2020-10-23 09:38:10 -04:00
Anuken
3d46ed580e
Merge branch 'master' into patch-7 2020-10-23 09:35:13 -04:00
Anuken
d7e5828347
Merge pull request #2942 from YellOw139/patch-5 
[Bundle][RO] Translation Update
 2020-10-23 09:34:40 -04:00