Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
jpanther committed Jan 29, 2020
2 parents 70aa267 + 80a2740 commit 5576533
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 8 deletions.
7 changes: 7 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
---------------------------------------------------------------------------------------------------
Version: 0.10.5
Date: 29. 01. 2020
Bugfixes:
- Fixed flooring migration issue when adding mod to an existing save game
Locales:
- Updated Spanish translation (thanks to notallme)
---------------------------------------------------------------------------------------------------
Version: 0.10.4
Date: 29. 01. 2020
Added:
Expand Down
2 changes: 1 addition & 1 deletion info.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Dectorio",
"version": "0.10.4",
"version": "0.10.5",
"title": "Dectorio",
"author": "PantherX",
"contact": "",
Expand Down
7 changes: 7 additions & 0 deletions locale/es-ES/dectorio.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ dectorio-signals=Habilitar señales
dectorio-walls=Habilitar paredes y puertas
dectorio-landscaping=Habilitar paisajismo
dectorio-waterfill=Habilitar relleno con agua
dectorio-wood=Habilitar las losas de Madera
dectorio-gravel=Habilitar las losas de Grava
dectorio-concrete=Habilitar las losas de Concreto
dectorio-painted-concrete=Habilitar las losas de Concreto Pintado
dectorio-signs=Habilitar signos
dectorio-decoratives=Habilitar decoraciones
dectorio-item-group=Separar pestaña de elaboración
Expand Down Expand Up @@ -153,6 +157,8 @@ dect-sign-steel=Cartel de acero
dect-small-lamp-glow=Lámpara resplandeciente
dect-traffic-bollard=Bolardo de tráfico
stone-wall=Muro de piedra
gate=Portón de Piedra
dect-concrete-gate=Portón de Concreto

[tile-name]
dect-concrete-grid=Cuadricula de concreto
Expand Down Expand Up @@ -203,6 +209,7 @@ dect-wood-floor=Losas de madera
dect-earthworks=Terraplenes
dect-lawnmower=Cortadora de césped
dect-signs=Carteles
gates=Portones básicos

[technology-description]
dect-landscaping=Permite colocar superficies terrestres naturales.
Expand Down
8 changes: 3 additions & 5 deletions migrations/0.5.3.lua
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
for index, force in pairs(game.forces) do

force.reset_recipes()
force.reset_technologies()

Expand All @@ -15,9 +14,9 @@ for index, force in pairs(game.forces) do
rec["dect-base-grass-dry"].enabled = true
rec["dect-base-red-desert"].enabled = true
rec["dect-base-red-desert-dark"].enabled = true
end
end
end
if settings.startup["dectorio-flooring"].value then
if settings.startup["dectorio-wood"].value then
if tech["dect-wood-floor"].researched then
rec["dect-wood-floor"].enabled = true
end
Expand All @@ -38,5 +37,4 @@ for index, force in pairs(game.forces) do
rec["dect-concrete-wall"].enabled = true
end
end

end
end
3 changes: 1 addition & 2 deletions migrations/0.8.2.lua
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
for index, force in pairs(game.forces) do

force.reset_recipes()
force.reset_technologies()

local tech = force.technologies
local rec = force.recipes

if settings.startup["dectorio-flooring"].value then
if settings.startup["dectorio-concrete"].value then
if tech["concrete"].researched then
rec["dect-concrete-grid"].enabled = true
end
Expand Down

0 comments on commit 5576533

Please sign in to comment.