Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,718 Commits 4 Branches 180 Tags
e1130bafc85e88db3385f2d7d6612fd42033b08e
Commit Graph

2395 Commits

Author SHA1 Message Date
Vanguard
e1130bafc8 3 new lines, 2 removed lines 
New:
setting.bridgeopacity.name
block.liquid-void.name
block.liquid-void.description

Removed:
block.signal
block.editsignal
 2020-01-11 14:41:24 +03:00
Vanguard
2e114d09ea 22 changed lines 
mod.missing
item.plastanium.name
block.plastanium-wall.name
block.plastanium-wall-large.name
block.plastanium-compressor.name
item.scrap.description
item.spore-pod.description
item.blast-compound.description
liquid.oil.description
unit.revenant.description
block.multi-press.description
block.plastanium-compressor.description
block.spore-press.description
block.power-source.description
block.force-projector.description
block.conveyor.description
block.mass-driver.description
block.liquid-junction.description
block.phase-conduit.description
block.thorium-reactor.description
block.blast-drill.description
block.cyclone.description
 2020-01-03 07:27:50 +03:00
Vanguard
b44b0f9992 3 changed lines 
quit.confirm.tutorial
setting.coreselect.name
public.confirm
 2020-01-01 18:41:21 +03:00
Vanguard
616867b4b9 9 new lines, 1 changed line 
New:
be.update
be.update.confirm
be.updating
be.ignore
be.noupdates
be.check
server.kicked.serverRestarting
setting.coreselect.name
rules.blockhealthmultiplier

Changed:
wave.enemy
 2019-12-30 02:47:49 +03:00
Vanguard
341121f655 1 changed line 
block.mass-driver.description
 2019-12-24 14:01:38 +03:00
Vanguard
196f37eff1 1 changed line 
item.graphite.description
 2019-12-22 15:27:39 +03:00
Vanguard
2e110bff20 1 new line 
link.feathub.description
 2019-12-20 18:20:07 +03:00
Vanguard
f5b21c954e Merge branch 'master' into master 2019-12-18 13:22:37 +03:00
Vanguard
040f3d0254 2 changed lines 
mods.guide
mod.import.github
 2019-12-18 13:19:33 +03:00
Vanguard
f2687e4a1a 3 new lines, 3 changed lines 
New:
mod.erroredcontent
mod.errors
mod.noerrorplay

Changed:
mod.requiresversion
mod.remove.confirm
details
 2019-12-17 21:27:48 +03:00
Anuken
6971a76c8e І 2019-12-16 12:50:18 -05:00
Anuken
3cefc085bd Tentative RU bundle changes 2019-12-15 22:11:07 -05:00
Anuken
3d8e5bd36a Added new Cyrillic font 2019-12-15 21:31:55 -05:00
Anuken
d78d3daaf9 Updated script stub 2019-12-15 13:56:01 -05:00
Anuken
976d0f54b3 Merge branches 'master' and 'safe-mod-loading' of https://github.com/Anuken/Mindustry 
# Conflicts:
#	core/src/io/anuke/mindustry/mod/Mods.java
 2019-12-15 13:55:30 -05:00
Anuken
1c1db3990f Fully implemented safe content loading 2019-12-15 13:54:51 -05:00
Vanguard
17ae17dced 1 changed line 
tutorial.intro
 2019-12-15 16:15:51 +03:00
Anuken
58e3143e2a Content cleaning 2019-12-14 09:33:07 -05:00
Vanguard
601f6af3c8 1 changed line, 1 removed line 
Changed:
keybind.zoom.name

Removed:
keybind.zoom_hold.name

Moved some lines around to keep them in the same order with bundle.properties
 2019-12-13 19:10:59 +03:00
Anuken
7b1a0a42d4 Merge pull request #1206 from joshuaptfan/zoom-no-hold 
Make scroll zoom by default, remove zoom hold keybind
 2019-12-12 18:35:29 -05:00
Anuken
8c1c54d49a Merge pull request #1207 from Prosta4okua/master 
1 new line
 2019-12-12 16:31:04 -05:00
Vanguard
e22f853a31 1 new line 
mod.scripts.unsupported
 2019-12-13 00:08:23 +03:00
Anuken
1ae20553ff Merge remote-tracking branch 'origin/master' 2019-12-12 16:07:40 -05:00
Anuken
c68eaade94 Merge pull request #1204 from Prosta4okua/master 
Ukrainian translation.
 2019-12-12 16:07:29 -05:00
Anuken
1461b5b357 Merge pull request #1205 from Prosta4okua/patch-2 
True Ukrainian translation
 2019-12-12 16:07:05 -05:00
Anuken
f0dd3b3a39 Merge pull request #1109 from ballgamer56/patch-1 
Thai translation
 2019-12-12 15:54:50 -05:00
Anuken
61d724ee2b Added Thai font 2019-12-12 15:54:25 -05:00
Prosta4okua
d60c2c5b63 Merge branch 'master' into patch-2 2019-12-12 22:40:30 +02:00
Prosta4okua
7e696cadaf Update bundle_uk_UA.properties 2019-12-12 22:36:54 +02:00
Anuken
0f23bf9d08 Merge pull request #1156 from martin-mfg/master 
add and fix some German translations
 2019-12-12 15:34:44 -05:00
Anuken
202d79817a Merge pull request #1149 from itskatt/french-translation 
Update the French Translation
 2019-12-12 15:34:06 -05:00
joshuaptfan
736737f151 Make scroll zoom by default, remove zoom hold keybind 2019-12-12 12:23:32 -08:00
AmateurPotion
fed4842222 Update bundle_ko.properties 2019-12-12 21:48:38 +09:00
Anuken
6f3d585118 Merge pull request #1183 from GioIacca9/patch-2 
Update bundle_it.properties
 2019-12-11 14:24:37 -05:00
Anuken
962ce7bfa6 Merge pull request #1187 from AmateurPotion/patch-22 
Update bundle_ko.properties
 2019-12-11 14:24:24 -05:00
Anuken
b6ee157adb Update bundle_zh_TW.properties (#1190) 
* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties
 2019-12-11 14:24:15 -05:00
TsjipTsjip
a45a632726 Update bundle_nl_BE.properties (#1194) 2019-12-11 14:24:07 -05:00
Atan599
f6b9830f82 Update bundle_cs.properties (#1192) 2019-12-11 10:51:34 -05:00
Ali-C-Ila
a2382965f6 Update bundle_zh_TW.properties 2019-12-10 20:17:55 +08:00
Ali-C-Ila
09dbee1401 Update bundle_zh_TW.properties 2019-12-10 20:09:21 +08:00
AmateurPotion
83a3195e34 Update bundle_ko.properties 2019-12-10 10:26:40 +09:00
AmateurPotion
8148f2a0f7 Update bundle_ko.properties 2019-12-10 10:25:42 +09:00
Anuken
0078a8cb8e Fixed scripts not working on older Android phones 2019-12-09 12:48:15 -05:00
Anuken
9e07b95223 Functional tweaks 2019-12-08 22:50:54 -05:00
Anuken
1aca302518 Many changes to improve scripting 2019-12-08 18:34:23 -05:00
Anuken
6588fc6581 Removed pointless base object 2019-12-08 13:14:47 -05:00
GioIacca9
98a083abdd Update bundle_it.properties 2019-12-08 15:49:03 +01:00
Vanguard
86df70a839 1 new line 
load.scripts
 2019-12-08 15:34:43 +03:00
Anuken
268f3cc3c2 Merge branches 'master' and 'rhino-js-suffering' of https://github.com/Anuken/Mindustry 
# Conflicts:
#	core/src/io/anuke/mindustry/content/Blocks.java
#	gradle.properties
 2019-12-08 00:15:42 -05:00
Anuken
fd6abaff62 More class support 2019-12-07 21:46:35 -05:00