Merge branch 'develop'

jpanther · Nov 30, 2017 · 6736432 · 6736432
2 parents 3449ea1 + 849a4af
commit 6736432
Show file tree

Hide file tree

Showing 15 changed files with 203 additions and 43 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,18 @@
 
 The latest stable release is available at <https://github.com/jpanther/Dectorio/releases/latest>
 
+## v0.7.6 - 2017-12-01
+
+### Added
+* New setting for toggling whether ores can be placed as gravel
+* Dectorio floorings can now be placed adjacent to water when _Water Fix_ mod is installed
+
+### Bugfixes
+* Fixed that water tiles were not available for crafting when playing with _Alien Biomes_
+
+### Locales
+* Updated German, Korean and Polish translations
+
 ## v0.7.5 - 2017-11-21
 
 ### Added
@@ -39,20 +51,20 @@ The latest stable release is available at <https://github.com/jpanther/Dectorio/
 * Better handling for when third party mods that affect Dectorio are added or removed
 
 ### Bugfixes
-* Added some additional locale strings to fix issues with Creative Mode mod
+* Added some additional locale strings to fix issues with _Creative Mode_ mod
 
 ## v0.7.1 - 2017-10-21
 
 ### Bugfixes
-* Fixed migration error for existing saves without Alien Biomes mod
+* Fixed migration error for existing saves without _Alien Biomes_ mod
 
 ## v0.7.0 - 2017-10-20
 
 Please take note of the concrete recipe changes in this release. You may need to adjust parts of your factory.
 
 ### Added
 * New in-game settings for configuring Dectorio (replaces the old settings that were configured via config.lua)
-* Landscaping support for Alien Biomes mod
+* Landscaping support for _Alien Biomes_ mod
 
 ### Changed
 * Concrete recipe no longer requires iron sticks and reverts to the vanilla iron ore recipe

diff --git a/README.md b/README.md
@@ -88,7 +88,7 @@ When you launch the game, the new mod will be enabled by default.
 
 * Includes settings for enabling or disabling each of the above features (Options > Mods > Startup). Ideally these should only be changed before starting a new game. Changes on existing games will require content to be migrated and some items may be lost if you disable components you've already used on an existing save. Always make a backup first!
 
-  ![Mod settings](https://cl.ly/0u3s0Y3G1A39/modsettings.png)
+  ![Mod settings](https://cl.ly/3J0S0z0T2B1l/mod-settings.png)
 
 * Items above marked ^ can be further customised in the mod settings dialog
 
@@ -128,14 +128,14 @@ Dectorio uses CrowdIn to translate the mod into various languages.
 
 Fully supported languages:
 * English
-* German (84%)
-* Polish (85%)
 
-Languages in progress:
-* Chinese Simplified (38%)
-* Chinese Traditional (46%)
-* Czech (52%)
-* Korean (39%)
+Community translations:
+* Chinese Simplified (37%)
+* Chinese Traditional (45%)
+* Czech (50%)
+* German (80%)
+* Korean (100%)
+* Polish (81%)
 
 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.
 
@@ -145,13 +145,15 @@ Limited testing has been completed with other mods. Warnings will be shown in-ga
 
 It is not recommended to use other coloured signal mods at the same time as Dectorio. This can cause coloured signals to be overwritten multiple times and lead to game-breaking compatibility issues with other mods. If you would like more colours, you can add these in the Dectorio config.lua file (instructions are in the file).
 
-Dectorio includes specific support for [Alien Biomes](https://mods.factorio.com/mods/Earendel/alien-biomes).
+Dectorio includes specific support for [Alien Biomes](https://mods.factorio.com/mods/Earendel/alien-biomes) and [Water Fix](https://mods.factorio.com/mods/Earendel/water-fix).
 
 Other mods with additional Dectorio support (thanks!): [Concreep](https://mods.factorio.com/mods/Mylon/Concreep), [FARL](https://mods.factorio.com/mods/Choumiko/FARL), [Pavement Drive Assist](https://mods.factorio.com/mods/Arcitos/PavementDriveAssist).
 
 Other decorative mods worth checking out (all compatible with Dectorio): [Asphalt Roads](https://mods.factorio.com/mods/Arcitos/AsphaltRoads), [Beautiful Bridge Railway](https://mods.factorio.com/mods/kapaer/beautiful_bridge_railway), [Naked Rails](https://mods.factorio.com/mods/futileohm/naked-rails).
 
-Mods with known compatiblity issues with Dectorio (either don't install these, or edit your mod settings and disable the conflicting components in Dectorio): [Expanded Color Lamps](https://mods.factorio.com/mods/Klonan/Expanded_Color_Lamps), [More Colours](https://mods.factorio.com/mods/zx64/more-colours), [More signal color](https://mods.factorio.com/mods/devilwarriors/More%20signal%20color), [Concrete and Stone](https://mods.factorio.com/mods/Earendel/concrete-and-stone), [Reinforced Walls](https://mods.factorio.com/mods/ChurchOrganist/Reinforced-Walls), [No Walls or Gates](https://mods.factorio.com/mods/abregado/no-walls).
+Mods with known compatibility issues with Dectorio (either don't install these, or edit your mod settings and disable the conflicting components in Dectorio): [Expanded Color Lamps](https://mods.factorio.com/mods/Klonan/Expanded_Color_Lamps), [More Colours](https://mods.factorio.com/mods/zx64/more-colours), [More signal color](https://mods.factorio.com/mods/devilwarriors/More%20signal%20color), [Concrete and Stone](https://mods.factorio.com/mods/Earendel/concrete-and-stone), [Reinforced Walls](https://mods.factorio.com/mods/ChurchOrganist/Reinforced-Walls), [No Walls or Gates](https://mods.factorio.com/mods/abregado/no-walls).
+
+Please also be aware that if you are playing with the [Picker Extended Version](https://mods.factorio.com/mods/Nexela/PickerExtended) mod, if you have the "Enable Gravel" option turned on in Dectorio, the stack sizes of raw ore materials will reflect the tile stack size setting of Picker Extended. By default this will increase your ore stack sizes to 100. If you do not want this behaviour, you can either change the picker tile stack setting to 50 or disable the gravel setting in Dectorio.
 
 ### Changelog
 
@@ -165,5 +167,6 @@ Special thanks to [marcfj](https://github.com/marcfj) for support and play testi
 #### 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).
+Polish translation by [Tomirad](https://github.com/Tomirad).  
+Czech translation by [dereksp](https://crowdin.com/profile/dereksp).  
+Korean translation by [Xagros](https://crowdin.com/profile/GimoXagros).  
diff --git a/config.lua b/config.lua
@@ -89,7 +89,7 @@ DECT.ENABLED = {
 	["walls"] = settings.startup["dectorio-walls"].value,
 	["landscaping"] = settings.startup["dectorio-landscaping"].value,
 	["wood-floor"] = settings.startup["dectorio-flooring"].value,
-	["gravel"] = settings.startup["dectorio-flooring"].value,
+	["gravel"] = settings.startup["dectorio-gravel"].value,
 	["painted-concrete"] = settings.startup["dectorio-painted-concrete"].value,
 	["signs"] = settings.startup["dectorio-signs"].value,
 	["decoratives"] = settings.startup["dectorio-decoratives"].value,
@@ -111,7 +111,8 @@ DECT.CONFIG.SETTINGS = {
 DECT.CONFIG.PAINT_VARIANTS = {"danger", "emergency", "caution", "radiation", "defect", "operations", "safety"}
 DECT.CONFIG.SIGN_CATEGORIES = {"item", "fluid", "tool", "ammo", "armor", "capsule", "gun", "mining-tool", "module"}
 DECT.CONFIG.SIGN_BLACKLIST = {"barrel", "loader", "simple%-entity", "player%-port", "computer", "coin", "small%-plane", "railgun", "vehicle%-machine%-gun", "tank%-machine%-gun", "factory%-1%-", "factory%-2%-", "factory%-3%-"}
-DECT.CONFIG.BASE_TILES = {"dirt", "sand", "sand-dark", "grass", "grass-dry", "red-desert", "red-desert-dark", "water", "water-green"}
+DECT.CONFIG.BASE_TILES = {"dirt", "sand", "sand-dark", "grass", "grass-dry", "red-desert", "red-desert-dark"}
+DECT.CONFIG.BASE_WATER_TILES = {"water", "water-green"}
 
 DECT.INCOMPATIBLE = {}
 DECT.INCOMPATIBLE.REASONS = {

diff --git a/data-updates.lua b/data-updates.lua
@@ -1,3 +1,4 @@
 -- data-updates
 
-require("prototypes.third-party.alien-biomes")
+require("prototypes.third-party.alien-biomes")
+require("prototypes.third-party.water-fix")
diff --git a/info.json b/info.json
@@ -1,6 +1,6 @@
 {
     "name": "Dectorio",
-    "version": "0.7.5",
+    "version": "0.7.6",
     "title": "Dectorio",
     "author": "PantherX",
     "contact": "",

diff --git a/locale/de/dectorio.cfg b/locale/de/dectorio.cfg
@@ -21,7 +21,6 @@ dectorio-walls-stack-size=Stapelgröße von Mauern
 dectorio-signals=Aktiviert zusätzliche Signale für Lampen und Schaltungsnetze
 dectorio-walls=Aktiviert zusätzliche Arten von Mauern und Toren
 dectorio-landscaping=Aktiviert die Möglichkeit, Sand, Erde, Gras, rote Wüste und Wasser herzustellen
-dectorio-flooring=Aktiviert die Möglichkeit, Bodentypen wie Holzboden und Kies herzustellen
 dectorio-painted-concrete=Aktiviert bemalte Betontypen, die den normalen Beton mit Gefahrenmarkierung ersetzen
 dectorio-signs=Aktiviert die Möglichkeit, Schilder zu herzustellen
 dectorio-vanilla-hazard-concrete-style=Wenn diese Option aktiviert ist, sieht bemalter Beton mit Gefahrenmarkierung aus wie der normale Factorio-Beton mit Gefahrenmarkierung (erfordert, dass bemalter Beton aktiviert ist)
@@ -158,3 +157,4 @@ signal-pink=Rosa Signal
 signal-white=Weißes Signal
 signal-grey=Graues Signal
 signal-black=Schwarzes Signal
+
diff --git a/locale/en/dectorio.cfg b/locale/en/dectorio.cfg
@@ -9,6 +9,7 @@ dectorio-signals=Enable Signals
 dectorio-walls=Enable Walls and Gates
 dectorio-landscaping=Enable Landscaping
 dectorio-flooring=Enable Floorings
+dectorio-gravel=Enable Gravel
 dectorio-painted-concrete=Enable Painted Concrete
 dectorio-signs=Enable Signs
 dectorio-decoratives=Enable Decoratives
@@ -24,7 +25,8 @@ dectorio-walls-stack-size=Wall items stack size
 dectorio-signals=Enables additional signals for use in lamps or the circuit network
 dectorio-walls=Enables additional wall and gate types
 dectorio-landscaping=Enables the ability to craft sand, dirt, grass, red desert and water
-dectorio-flooring=Enables the ability to craft flooring types including wooden floorboards and gravel
+dectorio-flooring=Enables the ability to craft flooring types including wooden floorboards
+dectorio-gravel=Enables the ability for raw ore materials to be placed on the ground as gravel
 dectorio-painted-concrete=Enables painted concrete styles that replace the base Hazard concrete
 dectorio-signs=Enables the ability to place signs
 dectorio-decoratives=Enables the ability to craft decorative items for your factory

diff --git a/locale/ko/dectorio.cfg b/locale/ko/dectorio.cfg
@@ -1,44 +1,81 @@
 [mod-name]
-Dectorio=Dectorio
+Dectorio=덱토리오(Dectorio)
 
 [mod-description]
+Dectorio=공장을 아름답게 장식하는 장식 요소를 추가합니다. 현재는 투광 조명, 나무 울타리, 철조망, 돌 및 콘크리트 벽, 위험 출입구, 간판, 나무 바닥재, 자갈 및 바닥 표시 콘크리트 스타일이 포함됩니다.\n\n번역: Team Xagros[https://mods.factorio.com/mods/Xagros/XMKTP]
 
 [mod-setting-name]
 dectorio-signals=신호 활성화
 dectorio-walls=벽 및 출입구 활성화
+dectorio-landscaping=조경 활성화
+dectorio-flooring=바닥재 활성화
+dectorio-gravel=자갈 활성화
 dectorio-painted-concrete=바닥 표시 콘크리트 활성화
 dectorio-signs=표지판 활성화
 dectorio-decoratives=장식 활성화
+dectorio-item-group=별도 조합법 탭 활성화
+dectorio-vanilla-hazard-concrete-style=팩토리오 기본 위험 콘크리트 스타일 사용
+dectorio-landscaping-blueprintable=조경 아이템 청사진화 허용
+dectorio-decorative-removal-probability=장식 제거 확율
+dectorio-flooring-stack-size=바닥재 아이템 소지 갯수
+dectorio-landscaping-stack-size=조경 아이템 소지 갯수
+dectorio-walls-stack-size=벽 아이템 소지 갯수
 
 [mod-setting-description]
+dectorio-signals=추가 된 신호를 조명 또는 회로 네트워크에서 사용 할 수 있습니다.
+dectorio-walls=추가 된 벽 및 출입구 종류를 사용 할 수 있습니다.
+dectorio-landscaping=다양한 조경 아이템들을 사용 할 수 있습니다.
+dectorio-flooring=다양한 바닥재 아이템들을 사용 할 수 있습니다.
+dectorio-gravel=다양한 광석을 자갈처럼 바닥에 배치 할 수 있는 기능을 사용 할 수 있습니다.
+dectorio-painted-concrete=기본 위험 콘크리트 스타일을 대체하는 다양한 콘크리트 바닥 스타일을 사용합니다.
+dectorio-signs=표지판을 배치 하는 기능 사용 할 수 있습니다.
+dectorio-decoratives=공장 조경을 꾸미기 위한 다양한 장식품을 사용 할 수 있습니다.
+dectorio-item-group=추가 된 조합식을 별도의 제작탭으로 분리합니다.
+dectorio-vanilla-hazard-concrete-style=옵션이 활성화되면 배치시 바닥 표시 콘크리트가 기존 팩토리오의 위험 콘크리트로 보입니다. (바닥 표시 콘크리트 활성화 필요)
+dectorio-landscaping-blueprintable=옵션이 활성화되면 조경 아이템이 청사진에 포함됩니다.
+dectorio-decorative-removal-probability=바닥재를 배치시 장식물이 제거 될 확률입니다. (1 = 100% 제거됨(기본값), 0.5 = 50%, 0 = 제거 안 됨)
+dectorio-flooring-stack-size=인벤토리 슬롯의 바닥 아이템 소지 갯수 (기본값 = 500)
+dectorio-landscaping-stack-size=인벤토리 슬롯의 조경 아이템 소지 갯수 (기본값 = 500)
+dectorio-walls-stack-size=인벤토리 슬롯의 벽 아이템 소지 갯수 (기본값 = 200)
 
 [dect-gui]
 sign-title=아이콘 선택
 sign-cancel=취소
 
 [dect-notify]
-dectorio=Dectorio
+dectorio=덱토리오
+version=[__1__] 버전: __2__ 설치됨.
 new-version=[__1__] __2__ 버전에서 __3__ 버전으로 업데이트 되었습니다.
 incompatible=[__1__] 경고: 호환되지 않는 모드가 감지되었습니다!
+reason-signals=[__1__] 원인: '__2__'은(는) 신호 데이터를 덮어씌웁니다. 모드 '__2__'을(를) 비활성화하는 것을 권장드립니다.
+reason-tech=[__1__] 원인: '__2__'은(는) 덱토리오의 연구 정보와 중복됩니다. 모드 '__2__'을(를) 비활성화하는 것을 권장드립니다.
+reason-disable=[__1__] 원인: '__2__'은(는) 덱토리오의 추가 기능을 비활성화합니다. 모드 '__2__'을(를) 비활성화하는 것을 권장드립니다.
+mod-portal=[__1__] 자세한 내용은 모드 포털을 참조바랍니다.
 supported-mod-added=[__1__] 모드 __2__에 대한 지원이 추가되었습니다.
 supported-mod-removed=[__1__] 모드 __2__에 대한 지원이 제거되었습니다.
 
 [dect-signal]
 arrow-down=하
 arrow-up=상
+arrow-left=좌
+arrow-right=우
 arrow-vertical=수직
 arrow-horizontal=수평
+arrow-universal=전방향
 arrow-reset=초기화
 misc-clock=시간
+misc-alarm=알람
+misc-battery=배터리
 misc-power=전력
 misc-nuclear=원자력
 misc-rocket=로켓
 misc-temperature=온도
 misc-finish=완료
 misc-gears=기어
-misc-star=시작
+misc-star=별
 
 [item-group-name]
+dectorio=덱토리오
 
 [item-name]
 dect-base-dirt=흙
@@ -59,8 +96,17 @@ dect-paint-danger=위험 구역 콘크리트
 dect-paint-defect=결함 구역 콘크리트
 dect-paint-operations=통제 구역 콘크리트
 dect-wood-floor=나무 바닥
+dect-small-lamp-glow=투광 조명
 
 [item-description]
+hazard-concrete=__CONTROL__rotate__키로 타일 무늬 방향을 회전시킵니다.
+dect-paint-emergency=__CONTROL__rotate__키로 타일 무늬 방향을 회전시킵니다.
+dect-paint-radiation=__CONTROL__rotate__키로 타일 무늬 방향을 회전시킵니다.
+dect-paint-safety=__CONTROL__rotate__키로 타일 무늬 방향을 회전시킵니다.
+dect-paint-caution=__CONTROL__rotate__키로 타일 무늬 방향을 회전시킵니다.
+dect-paint-danger=__CONTROL__rotate__키로 타일 무늬 방향을 회전시킵니다.
+dect-paint-defect=__CONTROL__rotate__키로 타일 무늬 방향을 회전시킵니다.
+dect-paint-operations=__CONTROL__rotate__키로 타일 무늬 방향을 회전시킵니다.
 dect-small-lamp-glow=이 조명에 신호가 전달되면 넓은 반경을 밝힙니다.
 
 [recipe-name]
@@ -71,7 +117,10 @@ dect-wood-wall=나무 울타리
 dect-chain-wall=철조망
 dect-concrete-wall=콘크리트 벽
 dect-hazard-gate=위험 출입구
+dect-sign-wood=목제 표지판
 dect-sign-steel=철제 표지판
+dect-small-lamp-glow=투광 조명
+dect-traffic-bollard=시선유도봉
 
 [tile-name]
 hazard-concrete-left=위험 콘크리트
@@ -97,6 +146,7 @@ dect-copper-gravel=구리 자갈
 dect-coal-gravel=석탄 자갈
 
 [technology-name]
+dect-landscaping=조경
 dect-concrete-paint=바닥 표시 콘크리트
 stone-walls=돌 벽
 dect-advanced-walls=고급 벽
@@ -108,7 +158,8 @@ dect-signs=표지판
 dect-landscaping=자연의 바닥을 지면에 배치 가능합니다.
 dect-concrete-paint=다양한 종류의 콘크리트 배치 가능합니다.
 stone-walls=공격자로부터 공장을 지키기 위한 벽입니다.
-dect-advanced-walls=공격자로부터 공장을 지키기 위한 기존 벽보다 튼튼한 벽입니다.
+dect-advanced-walls=공격자로부터 공장을 지키기 위한 기존 벽 보다 튼튼한 벽입니다.
+dect-wood-floor=바닥을 덮고 더 빨리 움직일 수있는 기본적인 나무 바닥재입니다.
 landfill=방해되는 물을 메우는 데 사용합니다.
 dect-signs=공장을 분류하여 표시 할 때 유용한 표지판입니다.
 
@@ -119,6 +170,7 @@ signal-tangerine=귤색 신호
 signal-yellow=노란색 신호
 signal-green=초록색 신호
 signal-cyan=청록색 신호
+signal-aqua=물색 신호
 signal-blue=파란색 신호
 signal-purple=보라색 신호
 signal-pink=분홍색 신호

diff --git a/locale/pl/dectorio.cfg b/locale/pl/dectorio.cfg
@@ -21,7 +21,6 @@ dectorio-walls-stack-size=Rozmiar stosu elementów ogrodzeniowych
 dectorio-signals=Włącz dodatkowe sygnały do użycia w lampach lub sieci obwodowej
 dectorio-walls=Włącza dodatkowe typy bram i murów
 dectorio-landscaping=Włącza możliwości tworzenia piachu, podłoża błotnistego, trawiastego, pustyń i wody
-dectorio-flooring=Włącza możliwość tworzenia podłoża wykonanego z drewna oraz żwiru
 dectorio-painted-concrete=Włącz możliwość tworzenia malowania ostrzeżeń na betonie
 dectorio-signs=Włącza możliwość stawiania znaków informacyjnych
 dectorio-vanilla-hazard-concrete-style=Kiedy włączony, Malowane Ostrzeżenia na betonie będą takie jak domyślne ostrzeżenia Factorio (wymagany jest włączony dodatek Malowany Beton)
@@ -160,3 +159,4 @@ signal-pink=Różowy kolor sygnału
 signal-white=Biały kolor sygnału
 signal-grey=Szary kolor sygnału
 signal-black=Czarny kolor sygnału
+
diff --git a/makerelease.sh b/makerelease.sh
@@ -5,6 +5,10 @@
 # https://stedolan.github.io/jq/
 modname=`cat info.json|jq -r .name`
 modver=`cat info.json|jq -r .version`
+gitbranch=`git rev-parse --abbrev-ref HEAD`
+
+# Switch to master branch
+git checkout master
 
 # Create git tag for this version
 git tag "v$modver"
@@ -13,4 +17,7 @@ git tag "v$modver"
 git archive --prefix "${modname}_$modver/" -o "../release/${modname}_$modver.zip" HEAD
 
 # Push tag to git
-git push origin "v$modver"
+git push origin "v$modver"
+
+# Switch back to original branch
+git checkout $gitbranch
diff --git a/migrations/0.7.6.lua b/migrations/0.7.6.lua
@@ -0,0 +1,15 @@
+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-landscaping"].value then
+		if tech["landfill"].researched then
+			rec["dect-base-water"].enabled = true
+			rec["dect-base-water-green"].enabled = true
+		end
+	end
+end