Merge branch 'develop' for release

CHANGELOG.md

@@ -2,6 +2,16 @@
 
 The latest stable release is available at <https://github.com/jpanther/Dectorio/releases/latest>
 
+## v0.7.5 - 2017-11-21
+
+### Added
+* New crafting tab to separate decorative items from other crafting menus - can be disabled in settings (thanks to [Aidiakapi](https://github.com/Aidiakapi))
+* New localisation system - help translate Dectorio by visiting [CrowdIn](https://crowdin.com/project/dectorio)
+* Added initial Czech translation (thanks to [dereksp](https://crowdin.com/profile/dereksp))
+
+### Bugfixes
+* Fixed some audio and repairability issues with traffic bollards
+
 ## v0.7.4 - 2017-11-04
 
 ### Bugfixes

README.md

@@ -1,4 +1,5 @@
 # Dectorio
+[![GitHub issues](https://img.shields.io/github/issues/jpanther/Dectorio.svg)](https://github.com/jpanther/Dectorio/issues) [![CrowdIn](https://d322cqt584bo4o.cloudfront.net/dectorio/localized.svg)](https://crowdin.com/project/dectorio) [![GitHub license](https://img.shields.io/github/license/jpanther/Dectorio.svg)](https://github.com/jpanther/Dectorio/blob/develop/LICENSE)
 
 A simple mod that adds decorative elements to beautify your factory. New technology research is required to unlock the various items before they can be crafted and some default recipes are adjusted to better reflect how these items should be made.
 
@@ -123,12 +124,20 @@ Feel free to get in touch with any issues or suggestions for new features you'd
 
 ### Language Support
 
-Supported languages:
+Dectorio uses CrowdIn to translate the mod into various languages.
+
+Fully supported languages:
 * English
-* German
-* Polish
+* German (84%)
+* Polish (85%)
+
+Languages in progress:
+* Chinese Simplified (38%)
+* Chinese Traditional (46%)
+* Czech (52%)
+* Korean (39%)
 
-If you are able to translate the mod into an additional language, please let me know (refer to the [_Contributing_](#contributing) section above) and I'll package it into the bundle for distribution (with credit to you).
+If you are able to translate the mod into any of the above languages, or you know an additional language that you'd like to add a new translation for, please visit the [Dectorio project on CrowdIn](https://crowdin.com/project/dectorio) to help with the translation effort.
 
 ### Mod Compatibility
 
@@ -151,9 +160,10 @@ Refer to the [CHANGELOG](CHANGELOG.md) for a detailed list of changes in each ve
 ### Credits
 
 Developed with ❤ by [James Panther](https://github.com/jpanther) in Melbourne, Australia.  
-Special thanks to [marcfj](https://github.com/marcfj) for support and playtesting.
+Special thanks to [marcfj](https://github.com/marcfj) for support and play testing.
 
 #### Translators
 
 German translation by [seeba8](https://github.com/seeba8).  
 Polish translation by [Tomirad](https://github.com/Tomirad).
+Czech translation by [dereksp](https://crowdin.com/profile/dereksp).

config.lua

@@ -13,7 +13,7 @@ DECT.CONFIG.SIGNALS = {
 	-- All the signal colors to be changed/added
 	-- RGBA values from 0 to 1, alpha is optional
 	-- The order of the virtual signals is the order they will appear in-game
-	-- NOTE: New virtual signals will need localised names to be provided in '/locale/[language]/signals.cfg'
+	-- NOTE: New virtual signals will need localised names to be provided in '/locale/[language]/dectorio.cfg'
 	-- Color names are from Name That Color (http://chir.ag/projects/name-that-color/)
 	{type="virtual", name="signal-red", color={r=1.00,g=0.16,b=0.10,a=1.00}},           -- Scarlet
 	{type="virtual", name="signal-orange", color={r=0.99,g=0.44,b=0.22,a=1.00}},        -- Orange
@@ -93,8 +93,12 @@ DECT.ENABLED = {
 	["painted-concrete"] = settings.startup["dectorio-painted-concrete"].value,
 	["signs"] = settings.startup["dectorio-signs"].value,
 	["decoratives"] = settings.startup["dectorio-decoratives"].value,
+	["item-group"] = settings.startup["dectorio-item-group"].value,
 }
 
+-- The subgroups for all items in the mod
+DECT.ITEM_GROUP = DECT.ENABLED["item-group"] and "dectorio" or "logistics"
+
 DECT.CONFIG.SETTINGS = {
 	["decorative_removal_probability"] = settings.startup["dectorio-decorative-removal-probability"].value,
 	["vanilla_hazard_concrete"] = settings.startup["dectorio-vanilla-hazard-concrete-style"].value,
@@ -111,8 +115,8 @@ DECT.CONFIG.BASE_TILES = {"dirt", "sand", "sand-dark", "grass", "grass-dry", "re
 
 DECT.INCOMPATIBLE = {}
 DECT.INCOMPATIBLE.REASONS = {
-	["signals"] = "dect-notify-reason-signals",
-	["tech"] = "dect-notify-reason-tech",
+	["signals"] = "dect-notify.reason-signals",
+	["tech"] = "dect-notify.reason-tech",
 }
 DECT.INCOMPATIBLE.MODS = {
 	["Expanded_Color_Lamps"] = {
@@ -147,4 +151,4 @@ DECT.INCOMPATIBLE.MODS = {
 	},
 }
 
-return DECT
+return DECT

control.lua

@@ -74,7 +74,7 @@ local function init_global()
 end
 
 -- Check if any technologies or recipes need to be enabled
-local function unlock_tech_and_recipes() 
+local function unlock_tech_and_recipes()
 	for _,force in pairs(game.forces) do
 		force.reset_recipes()
 		force.reset_technologies()
@@ -84,7 +84,7 @@ end
 -- Check game for known incompatibile mods
 local function check_incompatible_mods()
 	for mod, version in pairs(game.active_mods) do
-		if DECT.INCOMPATIBLE.MODS[mod] then 
+		if DECT.INCOMPATIBLE.MODS[mod] then
 			if DECT.ENABLED[DECT.INCOMPATIBLE.MODS[mod].component] then
 				return true
 			end
@@ -99,9 +99,9 @@ local function incompability_detected()
 		if DECT.INCOMPATIBLE.MODS[mod] then
 			incompatible = DECT.INCOMPATIBLE.MODS[mod]
 			if DECT.ENABLED[incompatible.component] then
-				notification({"dect-notify-incompatible", {"dect-notify-dectorio"}})
-				notification({"dect-notify-modportal", {"dect-notify-dectorio"}})
-				notification({DECT.INCOMPATIBLE.REASONS[incompatible.reason], {"dect-notify-dectorio"}, incompatible.name})
+				notification({"dect-notify.incompatible", {"dect-notify.dectorio"}})
+				notification({"dect-notify.mod-portal", {"dect-notify.dectorio"}})
+				notification({DECT.INCOMPATIBLE.REASONS[incompatible.reason], {"dect-notify.dectorio"}, incompatible.name})
 			end
 		end
 	end
@@ -123,12 +123,12 @@ local function on_configuration_changed(data)
 
 	-- Notify version and updates
 	if data.mod_changes ~= nil and data.mod_changes["Dectorio"] ~= nil and data.mod_changes["Dectorio"].old_version == nil then
-		notification({"dect-notify-version", {"dect-notify-dectorio"}, data.mod_changes["Dectorio"].new_version})
+		notification({"dect-notify.version", {"dect-notify.dectorio"}, data.mod_changes["Dectorio"].new_version})
 	elseif data.mod_changes ~= nil and data.mod_changes["Dectorio"] ~= nil and data.mod_changes["Dectorio"].old_version ~= nil then
 		unlock_tech_and_recipes()
 		local oldver = data.mod_changes["Dectorio"].old_version
 		local newver = data.mod_changes["Dectorio"].new_version
-		notification({"dect-notify-newversion", {"dect-notify-dectorio"}, oldver, newver})
+		notification({"dect-notify.new-version", {"dect-notify.dectorio"}, oldver, newver})
 	end
 
 	-- Check for incompatible mods and notify
@@ -155,7 +155,7 @@ local function on_configuration_changed(data)
 					for _, tile in pairs(alien_biomes) do
 						rec["dect-alien-biomes-"..tile].enabled = true
 					end
-					notification({"dect-notify-supportedmod-added", {"dect-notify-dectorio"}, "Alien Biomes"})
+					notification({"dect-notify.supported-mod-added", {"dect-notify.dectorio"}, "Alien Biomes"})
 				end
 			end
 		end
@@ -171,7 +171,7 @@ local function on_configuration_changed(data)
 					for _, tile in pairs(DECT.CONFIG.BASE_TILES) do
 						rec["dect-base-"..tile].enabled = true
 					end
-					notification({"dect-notify-supportedmod-removed", {"dect-notify-dectorio"}, "Alien Biomes"})
+					notification({"dect-notify.supported-mod-removed", {"dect-notify.dectorio"}, "Alien Biomes"})
 				end
 			end
 		end
@@ -185,10 +185,10 @@ local function create_sign_gui(player)
 	if player.gui.center["dect-gui-sign"] then
 		player.gui.center["dect-gui-sign"].destroy()
 	end
-	sign_gui = player.gui.center.add({type="frame", name="dect-gui-sign", caption={"dect-gui-sign-title"}, direction="vertical"})
+	sign_gui = player.gui.center.add({type="frame", name="dect-gui-sign", caption={"dect-gui.sign-title"}, direction="vertical"})
 	local gui_scroll = sign_gui.add({type="scroll-pane", name="dect-gui-scroll", vertical_scroll_policy="auto", horizontal_scroll_policy="auto", style="dect-scroll"})
 	local gui_table = gui_scroll.add({type="table", name="dect-icons-table", colspan=20, style="dect-icon-table"})
-	local gui_cancel = sign_gui.add({type="button", name="dect-gui-button-cancel", caption={"dect-gui-sign-cancel"}})
+	local gui_cancel = sign_gui.add({type="button", name="dect-gui-button-cancel", caption={"dect-gui.sign-cancel"}})
 	for _, icon in pairs(global.icons) do
 		local match = false
 		for _, child in pairs(gui_table.children_names) do
@@ -275,4 +275,4 @@ script.on_event(defines.events.on_built_entity, on_built_entity)
 script.on_event(defines.events.on_preplayer_mined_item, on_mined_entity)
 script.on_event(defines.events.on_robot_pre_mined, on_mined_entity)
 script.on_event(defines.events.on_entity_died, on_mined_entity)
-script.on_event(defines.events.on_gui_click, on_gui_click)
+script.on_event(defines.events.on_gui_click, on_gui_click)

data.lua

@@ -29,6 +29,7 @@ require("prototypes.entity.signs")
 require("prototypes.entity.walls")
 require("prototypes.entity.decoratives")
 
+require("prototypes.item.item-group")
 require("prototypes.item.flooring")
 require("prototypes.item.lamp")
 require("prototypes.item.landscaping")

info.json

@@ -1,6 +1,6 @@
 {
     "name": "Dectorio",
-    "version": "0.7.4",
+    "version": "0.7.5",
     "title": "Dectorio",
     "author": "PantherX",
     "contact": "",
@@ -9,4 +9,4 @@
     "dependencies": ["base >= 0.15", "? alien-biomes >= 0.2.7"],
     "license": "GNU GPLv3",
     "description": "Adds decorative elements to beautify your factory. Currently includes coloured signals, wooden, chain-link, stone and concrete walls, hazard gates, signs, wooden floorboards, gravel and painted concrete styles."
-}
+}

locale/cs/dectorio.cfg

@@ -0,0 +1,115 @@
+[mod-name]
+
+[mod-description]
+
+[mod-setting-name]
+
+[mod-setting-description]
+
+[dect-gui]
+sign-title=Vyberte ikonu
+sign-cancel=Zrušit
+
+[dect-notify]
+version=[__1__] Verze __2__ nainstalována.
+new-version=[__1__] Aktualizováno z verze __2__ na verzi __3__.
+incompatible=[__1__] Varování: Byl detekován nekompatibilní mod!
+reason-signals=[__1__] Důvod: '__2__' přepisuje data signálů. Je doporučeno deaktivovat '__2__'.
+reason-tech=[__1__] Důvod: '__2__' duplikuje technologii co již je v Dectoriu. Je doporučeno deaktivovat '__2__'.
+reason-disable=[__1__] Důvod: '__2__' deaktivuje funkce přidané Dectoriem. Je doporučeno deaktivovat '__2__'.
+mod-portal=[__1__] Přejděte na portál modu pro bližší informace.
+supported-mod-added=[__1__] Přidána podpora pro __2__.
+supported-mod-removed=[__1__] Odstraněna podpora pro __2__ .
+
+[dect-signal]
+
+[item-group-name]
+
+[item-name]
+dect-base-dirt=Hlína
+dect-base-sand=Písek
+dect-base-sand-dark=Tmavý písek
+dect-base-grass=Tráva
+dect-base-grass-dry=Suchá tráva
+dect-base-red-desert=Rudá poušť
+dect-base-red-desert-dark=Tmavě rudá poušť
+dect-base-water=Voda
+dect-base-water-green=Zelená voda
+hazard-concrete=Bezpečnostní beton
+dect-paint-emergency=Nouzový beton
+dect-paint-radiation=Radiační beton
+dect-paint-safety=Bezpečnostní beton
+dect-paint-caution=Bezpečnostní beton
+dect-paint-danger=Bezpečnostní beton
+dect-paint-defect=Poruchový beton
+dect-paint-operations=Operační beton
+dect-wood-floor=Dřevěné parkety
+dect-small-lamp-glow=Zářivá lampa
+
+[item-description]
+hazard-concrete=Stiskni __CONTROL__rotate__ pro otočení nabarvených polí.
+dect-paint-emergency=Stiskni __CONTROL__rotate__ pro otočení nabarvených polí.
+dect-paint-radiation=Stiskni __CONTROL__rotate__ pro otočení nabarvených polí.
+dect-paint-safety=Stiskni __CONTROL__rotate__ pro otočení nabarvených polí.
+dect-paint-caution=Stiskni __CONTROL__rotate__ pro otočení nabarvených polí.
+dect-paint-danger=Stiskni __CONTROL__rotate__ pro otočení nabarvených polí.
+dect-paint-defect=Stiskni __CONTROL__rotate__ pro otočení nabarvených polí.
+dect-paint-operations=Stiskni __CONTROL__rotate__ pro otočení nabarvených polí.
+dect-small-lamp-glow=Když tato lampa zaznamená signál, tak se rozsvítí silně do velkého okolí.
+
+[recipe-name]
+dect-concrete-wall-from-stone-wall=Betonová zeď z kamenné zdi
+
+[entity-name]
+dect-wood-wall=Dřevěná barikáda
+dect-chain-wall=Řetězový plot
+dect-concrete-wall=Betonová zeď
+dect-hazard-gate=Bezpečnostní brána
+dect-sign-wood=Dřevěná cedule
+dect-sign-steel=Ocelová cedula
+dect-small-lamp-glow=Zářivá lampa
+dect-traffic-bollard=Dopravní stožár
+
+[tile-name]
+hazard-concrete-left=Bezpečnostní beton
+hazard-concrete-right=Bezpečnostní beton
+dect-paint-emergency-left=Nouzový beton
+dect-paint-emergency-right=Nouzový beton
+dect-paint-radiation-left=Radiační beton
+dect-paint-radiation-right=Radiační beton
+dect-paint-safety-left=Bezpečnostní beton
+dect-paint-safety-right=Bezpečnostní beton
+dect-paint-caution-left=Bezpečnostní beton
+dect-paint-caution-right=Bezpečnostní beton
+dect-paint-danger-left=Bezpečnostní beton
+dect-paint-danger-right=Bezpečnostní beton
+dect-paint-defect-left=Poruchový beton
+dect-paint-defect-right=Poruchový beton
+dect-paint-operations-left=Operační beton
+dect-paint-operations-right=Operační beton
+dect-wood-floor=Dřevěné parkety
+dect-gravel=Štěrk
+dect-iron-gravel=Železný štěrk
+dect-copper-gravel=Měděný štěrk
+dect-coal-gravel=Uhelný štěrk
+
+[technology-name]
+dect-landscaping=Úprava krajiny
+dect-concrete-paint=Nabarvený beton
+stone-walls=Základní zdi
+dect-advanced-walls=Pokročilé zdi
+dect-wood-floor=Dřevěné parkety
+landfill=Zemní práce
+dect-signs=Cedule
+
+[technology-description]
+dect-landscaping=Umožní pokládání přírodních povrchů.
+dect-concrete-paint=Barvení betonu pro dodatečné dekorace.
+stone-walls=Základní zdi, které chrání vaši továrnu před útočníky.
+dect-advanced-walls=Silnější zdi pro chranu vaší továrny.
+dect-wood-floor=Jednoduchá dřevěná podlaha, která umožňuje rychlejší pohyb.
+landfill=Umožňuje pokládání a ničení vodních polí.
+dect-signs=Cedule pro jednodušší označování továrny.
+
+[virtual-signal-name]
+