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
6,015 Commits 4 Branches 160 Tags 2.1 GiB
424514e037
Commit Graph

365 Commits

Author SHA1 Message Date
Vanguard
424514e037
2 new lines 
schematic.replace
schematic.exists
 2020-03-10 05:39:14 +03:00
Vanguard
307f9ee297
2 changed lines 
link.trello.description
link.feathub.description
 2020-03-04 19:51:48 +03:00
Vanguard
1bbdedec72
1 changed line 
join.info
 2020-03-04 14:59:57 +03:00
Vanguard
5735fba4c7
2 changed lines 
unit.thousands
unit.millions
 2020-02-22 20:21:05 +03:00
Vanguard
2fc17fea2a
1 new line 
rules.solarpowermultiplier
 2020-02-22 04:04:53 +03:00
Vanguard
10732ccb5a
1 line removed 
schematic.replace
 2020-02-19 15:33:53 +03:00
Vanguard
fc46708677
1 changed line 
setting.pixelate.name
 2020-02-14 03:24:27 +03:00
Vanguard
9b30b452a1
3 changed lines 
servers.local
servers.remote
servers.global
 2020-02-06 03:39:32 +03:00
Vanguard
c254a702fc
3 new lines 
servers.local
servers.remote
servers.global
 2020-02-06 03:34:19 +03:00
Vanguard
6aed5f081c
1 new line 
stat.playtime
 2020-02-01 04:21:50 +03:00
Vanguard
91d1abf1e9
1 changed line 
editor.generate
 2020-01-30 04:17:46 +03:00
Vanguard
d1c2666fdd
1 changed line (new approach) 
techtree
 2020-01-27 16:11:23 +03:00
Vanguard
65e2a32722
1 changed line 
techtree
 2020-01-25 14:57:51 +03:00
Vanguard
0103a2b7c6
1 new line 
mod.display
 2020-01-25 04:05:03 +03:00
Prosta4okua
095cb68725
Update bundle_ru.properties 2020-01-25 02:12:21 +02:00
Vanguard
5c0f24aa41
1 changed line (reverted) 
unit.thousands
 2020-01-24 19:31:05 +03:00
Vanguard
17265382ed
1 changed line 
blocks.affinities
 2020-01-24 06:56:28 +03:00
Vanguard
a4031386f1
1 changed line 
unit.thousands
 2020-01-24 06:44:42 +03:00
Vanguard
68aba266df
Merge branch 'master' into master 2020-01-24 06:33:32 +03:00
Vanguard
308ce8aef3
1 changed line 
block.underflow-gate.name
 2020-01-24 06:32:40 +03:00
Vanguard
d99ce73ab4
3 new lines 
blocks.tiles
blocks.affinities
setting.playerlimit.name
 2020-01-24 06:23:41 +03:00
Vanguard
847a1a738e RU updates (#1354) 
* 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

* 1 changed line

tutorial.intro

* 3 new lines, 3 changed lines

New:
mod.erroredcontent
mod.errors
mod.noerrorplay

Changed:
mod.requiresversion
mod.remove.confirm
details

* 2 changed lines

mods.guide
mod.import.github

* 1 new line

link.feathub.description

* 1 changed line

item.graphite.description

* 1 changed line

block.mass-driver.description

* 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

* 3 changed lines

quit.confirm.tutorial
setting.coreselect.name
public.confirm

* 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

* 3 new lines, 2 removed lines

New:
setting.bridgeopacity.name
block.liquid-void.name
block.liquid-void.description

Removed:
block.signal
block.editsignal

* 1 new line

data.openfolder

* 1 changed line

block.cryofluidmixer.description

* 2 new lines

block.underflow-gate.name
block.underflow-gate.description

* 2 changed lines

unit.thousands
unit.millions

Co-authored-by: Anuken <arnukren@gmail.com>
 2020-01-23 18:10:53 -05:00
Anuken
368a53ee98
Merge branch 'master' into master 2020-01-23 18:10:48 -05:00
Avevad
c96931a1b9 Update bundle_ru.properties (#1410) 2020-01-23 18:07:37 -05:00
Anuken
288da868bf Merged #1406 manually 2020-01-23 14:53:27 -05:00
Vanguard
ed3474f5f0
2 changed lines 
unit.thousands
unit.millions
 2020-01-22 18:56:33 +03:00
Vanguard
33ef1ca804
2 new lines 
block.underflow-gate.name
block.underflow-gate.description
 2020-01-22 18:02:04 +03:00
Vanguard
4452c1b38a
1 changed line 
block.cryofluidmixer.description
 2020-01-12 23:33:59 +03:00
Vanguard
6243b9fa3a
1 new line 
data.openfolder
 2020-01-12 19:56:30 +03:00
Vanguard
9f743ce657
Merge branch 'master' into master 2020-01-11 14:44:27 +03:00
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
Anuken
8f208920f7 Merged in liquid void 2020-01-08 11:04:12 -05:00
Anuken
1193e18ee1 Updated bundles post-merge 2020-01-08 11:01:12 -05:00
Vanguard
2692b60d21 RU updates (#1277) 
* 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

* 1 changed line

tutorial.intro

* 3 new lines, 3 changed lines

New:
mod.erroredcontent
mod.errors
mod.noerrorplay

Changed:
mod.requiresversion
mod.remove.confirm
details

* 2 changed lines

mods.guide
mod.import.github

* 1 new line

link.feathub.description

* 1 changed line

item.graphite.description

* 1 changed line

block.mass-driver.description

* 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

* 3 changed lines

quit.confirm.tutorial
setting.coreselect.name
public.confirm

* 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-08 10:21:21 -05: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
01de18b663 RU updates (#1225) 
* 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

* 1 changed line

tutorial.intro

* 3 new lines, 3 changed lines

New:
mod.erroredcontent
mod.errors
mod.noerrorplay

Changed:
mod.requiresversion
mod.remove.confirm
details

* 2 changed lines

mods.guide
mod.import.github

* 1 new line

link.feathub.description

* 1 changed line

item.graphite.description
 2019-12-22 12:01:03 -05: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
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
3cefc085bd Tentative RU bundle changes 2019-12-15 22:11:07 -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
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
Vanguard
e22f853a31
1 new line 
mod.scripts.unsupported
 2019-12-13 00:08:23 +03:00