pyanodon · protocol-1903 · Jun 1, 2025 · Jun 2, 2025 · Jun 2, 2025 · Jun 2, 2025
diff --git a/...y+pycoalprocessing+pyfusionenergy+pyhightech+pyindustry+pypetroleumhandling+pyrawores.lua b/...y+pycoalprocessing+pyfusionenergy+pyhightech+pyindustry+pypetroleumhandling+pyrawores.lua
diff --git a/cached-configs/pyblock.lua b/cached-configs/pyblock.lua
diff --git a/changelog.txt b/changelog.txt
@@ -1,6 +1,66 @@
 ---------------------------------------------------------------------------------------------------
+Version: 3.2.12
+Date: 2025-09-15
+  Changes:
+    - Added DDC MK 00 to the DDC MK 01 recipe
+    - Autoteched the research tree. Things are definitely out of place.
+    - Moved Guar to logi sci to facilitate Phadai food production for rare earth ore
+---------------------------------------------------------------------------------------------------
+Version: 3.2.11
+Date: 2025-09-04
+  Changes:
+    - Buffed uranium phytomining to make MOX cells a viable option. I have no idea if MOX or uranium cells are better, but both are possible. Without candy shuffling at low science levels, uranium is far superior, but MOX is no longer a trap
+    - Buffed uranium enriched biomass to uranium ore recipe from 5:40 to 4:50
+    - Buffed uranium enriched biomass recipe times from 180:120:80, 120:100:80
+    - Buffed uranium enriched biomass recipe output from 10:20:80, 40:60:80
+    - Reduced bhoddos cost of urnaium enriched biomass from 8->5
+  Locale:
+    - Added Dutch locale courtesy of QatSquirrel on github
+---------------------------------------------------------------------------------------------------
+Version: 3.2.10
+Date: 2025-08-28
+  Changes:
+    - Marked Stellar Expedition as incompatible
+    - Reduced TBP cost of Uranyl Nitrate from 15 -> 10, increased crafting time from 15 -> 42
+---------------------------------------------------------------------------------------------------
+Version: 3.2.9
+Date: 2025-08-23
+  Bugfixes:
+    - Fixed crash with pyalienlife 3.0.57 due to duplicated functionality
+---------------------------------------------------------------------------------------------------
+Version: 3.2.8
+Date: 2025-08-17
+  Bugfixes:
+    - Fixed an occasional crash where the atomizer tech icon was the wrong size. Resolves https://github.com/pyanodon/pybugreports/issues/1157
+---------------------------------------------------------------------------------------------------
+Version: 3.2.7
+Date: 2025-08-13
+  Changes:
+    - Migrated wpu to wpu-mk01 internally
+---------------------------------------------------------------------------------------------------
+Version: 3.2.6
+Date: 2025-08-13
+  Changes:
+    - Changed internal name of "dirty-water-light" to "muddy-sludge".
+    - Changed internal name of "dirty-water-heavy" to "tailings".
+  Bugfixes:
+    - Fixed disabling fun entity names mod setting not applying to atomizer and solid separator
+    - Fixed disabling fun entity names mod setting breaking when using non-english locale
+---------------------------------------------------------------------------------------------------
+Version: 3.2.5
+Date: 2025-06-08
+  Locale:
+    - Updated Russian translation courtesy of @Astorin on github
+  Changes:
+    - Added DDC MK 00 to the DDC MK 01 recipe
+    - Added Automated Screamer MK 00 to the Automated Screener MK 01 recipe
+    - Added a mod setting to get rid of the fun MK 00 entity names DON'T YOU DARE USE IT
+  Bugfixes:
+    - Fix indentation so the changelog loads in the in-game mod manager
+    - Fixed Fawogae 2 not being moved to Fawogae Stage 1 and having incorrect product amount
+---------------------------------------------------------------------------------------------------
 Version: 3.2.4
-Date: ???
+Date: 2025-06-01
   Changes:
     - Buffed fertilized and agressive flora cultivation to be better than the previous recipe when considering the flora cost of manure
     - Buffed Thickened Coal Fines to Carbon Dust ratio from 1000:12 to 200:8. Resolves https://github.com/pyanodon/pybugreports/issues/976
@@ -327,9 +387,9 @@ Date: 2023-9-15
     - Moved saline to salt evap to evaporation tech
     - Added thumbnail. credit: Burr on discord
   Cadavaric arum:
-      - Removed botanical nursury from recipe
-      - Reduced steel plate requirement from 60 to 5
-      - added pipes(4), iron plates(5), and soil(20) as ingredients
+    - Removed botanical nursury from recipe
+    - Reduced steel plate requirement from 60 to 5
+    - added pipes(4), iron plates(5), and soil(20) as ingredients
 ---------------------------------------------------------------------------------------------------
 Version: 2.0.2
 Date: 2023-9-4

diff --git a/data-updates.lua b/data-updates.lua
@@ -1,5 +1,5 @@
-if settings.startup["pypp-dev-mode"].value == true and settings.startup["pypp-create-cache"].value == true then
-  for r, resource in pairs(data.raw.resource) do
+if settings.startup["pypp-tests"].value == true then
+  for _, resource in pairs(data.raw.resource) do
     resource.autoplace = nil
   end
 end
@@ -50,13 +50,6 @@ data:extend {
   }
 }
 
-
--- create "floating" seaweed that moves
-local seaweed = table.deepcopy(data.raw.tree.seaweed)
-data.raw.tree.seaweed = nil
-seaweed.type = "fish"
-data.raw.fish.seaweed = seaweed
-
 --adjust landfill cost for landfill painter
 if mods["LandfillPainting"] then
   local recipe_list = {
@@ -76,7 +69,7 @@ data.raw.technology["excavation-1"].prerequisites = nil
 
 table.insert(RECIPE("soot-separation").results, {type = "item", name = "ore-nickel", amount = 1, probability = 0.1})
 
-RECIPE("soot-separation"):set_fields {unlock_results = true, ignore_in_pypp = false}
+RECIPE("soot-separation").unlock_results = true
 
 RECIPE("mining-antimony"):remove_unlock("excavation-2"):add_unlock("excavation-1") --:set_fields{results = {{type = "item", name = "antimonium-ore", amount = 20}}}
 
@@ -168,7 +161,7 @@ RECIPE("soil"):remove_unlock("automation-science-pack"):set_fields {enabled = tr
 
 -- move starter ash separation recipes to ash-separation and set trigger tech
 TECHNOLOGY("ash-separation"):set_fields {research_trigger = {type = "craft-item", item = "ash", count = 200}, prerequisites = {"atomizer-mk00"}}
-RECIPE("copper-plate"):add_unlock("ash-separation"):set_fields {enabled = false}
+-- RECIPE("copper-plate"):add_unlock("ash-separation"):set_fields {enabled = false}
 RECIPE("inductor1-2"):add_unlock("ash-separation"):set_fields {enabled = false}
 data.raw["technology"]["ash-separation"].unit = nil
 
@@ -191,7 +184,7 @@ RECIPE("compost-plant-mk01"):add_ingredient {type = "item", name = "compost-plan
 
 RECIPE("slaughterhouse-mk01"):add_ingredient {type = "item", name = "slaughterhouse-mk00", amount = 1}
 
-RECIPE("destructive-distillation-column-mk01"):add_ingredient {type = "item", name = "destructive-distillation-column-mk00", amount = 1}
+RECIPE("distilator"):add_ingredient {type = "item", name = "ddc-mk00", amount = 1}
 
 -- increase construction costs of geothermal plant
 RECIPE("geothermal-plant-mk01"):add_ingredient {type = "item", name = "pipe", amount = 80}:add_ingredient {type = "item", name = "concrete", amount = 150}
@@ -217,6 +210,10 @@ RECIPE("iron-plate"):add_unlock("atomizer-mk00"):set_fields {enabled = false}
 -- add burner atomizer to atomizer mk01 recipe
 RECIPE("atomizer-mk01"):remove_ingredient("washer"):add_ingredient {type = "item", name = "atomizer-mk00", amount = 1}
 
+RECIPE("automated-screener-mk01"):add_ingredient {type = "item", name = "automated-screener-mk00", amount = 1}
+
+RECIPE("distilator"):add_ingredient {type = "item", name = "ddc-mk00", amount = 1}
+
 -- data.raw.technology["mega-farm"].unit.ingredients = {{"automation-science-pack", 1},{"py-science-pack-1",1}}
 -- TECHNOLOGY("mega-farm"):set_fields{prerequisites = {}}
 
@@ -286,6 +283,22 @@ for r, recipe in pairs(data.raw.recipe) do
   end
 end
 
+if settings.startup["disable-pyblock-fun-names"].value then
+  for _, entity in pairs({
+    "atomizer-mk00",
+    "automated-screener-mk00",
+    "ddc-mk00",
+    "slaughterhouse-mk00",
+    "soil-extractor-mk00",
+    "washer-mk00",
+    "wpu-mk00",
+    "solid-separator-mk00"
+  }) do
+    data.raw["assembling-machine"][entity].localised_name = { "", "entity-name-alt." .. entity, "entity-name." .. entity }
+  end
+  data.raw["furnace"]["compost-plant-mk00"].localised_name = { "", "entity-name-alt.compost-plant-mk00", "entity-name-alt.compost-plant-mk00" }
+end
+
 if register_cache_file ~= nil then
   register_cache_file({"pycoalprocessing", "pyfusionenergy", "pyindustry", "pyrawores", "pypetroleumhandling", "pyalienlife", "pyhightech", "pyalternativeenergy", "PyBlock"}, "__PyBlock__/cached-configs/PyBlock+pyalienlife+pyalternativeenergy+pycoalprocessing+pyfusionenergy+pyhightech+pyindustry+pypetroleumhandling+pyrawores")
 end
diff --git a/data.lua b/data.lua
@@ -2,7 +2,7 @@ TECHNOLOGY {
   type = "technology",
   name = "atomizer-mk00",
   icon = "__PyBlock__/graphics/icons/atomizer-mk00.png",
-  icon_size = 128,
+  icon_size = 64,
   order = "c-a",
   prerequisites = {},
   effects = {},

diff --git a/info.json b/info.json
@@ -1,6 +1,6 @@
 {
 	"name": "PyBlock",
-	"version": "3.2.3",
+	"version": "3.2.12",
 	"factorio_version": "2.0",
 	"title": "PyBlock",
 	"author": "KingArthur",
@@ -9,7 +9,8 @@
 	"description": "Pymod edition of a Sea Block style game",
 	"dependencies": [
 	"base >= 2.0",
-	"pyalternativeenergy >= 3.0.0",
-  "aai-loaders"
+	"pyalternativeenergy >= 3.1.34",
+  "? aai-loaders",
+  "! pystellarexpedition"
 	]
 }
diff --git a/locale/en/locale.cfg b/locale/en/locale.cfg
@@ -51,13 +51,33 @@ flora-cultivator-mk04=Flora Cultivator MK 04
 aai-shunt-loader=Shunt Loader
 shunt-inserter=Shunt Inserter
 
+[entity-name-alt]
+# just the normal names for these things
+ddc-mk00=Destructive Distilation Column MK 00
+soil-extractor-mk00=Soil Extractor MK 00
+solid-separator-mk00=Solid Separator MK 00
+burner-quenching-tower=Steampowered Quenching Tower
+washer-mk00=Washer MK 00
+wpu-mk00=Wood Processing Unit MK 00
+atomizer-mk00=Atomizer MK 00
+automated-screener-mk00=Automated Screener MK 00
+slaughterhouse-mk00=Slaughterhouse MK 00
+fwf-mk00=Fastwood Forestry MK 00
+compost-plant-mk00=Compost Plant MK 00
+
 [technology-name]
 atomizer-mk00=Early Molecular Decohesion
 pumping-productivity=Pumping Productivity
 
 [modifier-description]
 change-recipe-productivity=Mining Productivity: +10%
 
+[mod-setting-name]
+disable-pyblock-fun-names=Turn off alternate MK 00 names
+
+[mod-setting-description]
+disable-pyblock-fun-names=Why would you do such a thing?
+
 [noise-expression]
 pyblock_island=PyBlock Island
 pyblock_classic=PyBlock Single Tile

diff --git a/locale/nl/locale.cfg b/locale/nl/locale.cfg
@@ -0,0 +1,99 @@
+[item-name]
+sodium-acetate=Natriumacetaat
+fecl2=IJzer(II)chloride
+fecl3=IJzer(III)chloride
+nylon-rope=Nylonvezels
+nylon-rope-coated=Nylonvezels met ethyleendiamine
+nylon-rope-uranyl-soaked=Nylonvezels soaked doorweekt met uranylnitraat
+uranyl-nitrate=Uranylnitraat
+
+[fluid-name]
+butanol=n-Butanol
+phosphorus-tricloride=Fosfortrichloride
+phosphoryl-chloride=Fosforylchloride
+tributyl-phosphate=Tributylfosfaat
+ethane=Ethaan
+dichloroethane=1,2-Dichloorethaan
+ethylenediamine=Ethyleendiamine
+
+[recipe-name]
+coaldust-to-diamond=Diamand Smeden
+tailings-tin-alum=Tin/Alum uit Residuen
+propene-to-butanol=n-Butanol
+phosphorus-tricloride=Fosfortrichloride
+phosphoryl-chloride=Fosforylchloride
+tributyl-phosphate=Tributylfosfaat
+ree-from-ash=Zeldzame Aardelementen uit As
+flora-cultivation=Flora Teelt
+flora-cultivation-2=Bemeste Flora Teelt
+flora-cultivation-3=Agressieve Flora Teelt
+synthesize-flora=Inheemse Flora Synthese
+moss-cultivation=Mos Teelt
+sap-cultivation=Sap Extractie
+
+[entity-name]
+driftwood=Drijfhout
+ddc-mk00=Destructieve-relatiekolom MK 00
+soil-extractor-mk00=Aardediefer MK 00
+solid-separator-mk00=Vaste Stoffen Scheidsrechter MK 00
+burner-quenching-tower=Stoomgemotiveerde Blustoren
+washer-mk00=Wenser MK 00
+wpu-mk00=Stoutverwerkingseenheid MK 00
+atomizer-mk00=Versnuiver MK 00
+automated-screener-mk00=Geautomatiseerde Zifter MK 00
+slaughterhouse-mk00=Prachthuis MK 00
+fwf-mk00=Langzaamhoutbosbouw MK 00
+compost-plant-mk00=Flosfabriek MK 00
+flora-cultivator-mk01=Florateler MK 01
+flora-cultivator-mk02=Florateler MK 02
+flora-cultivator-mk03=Florateler MK 03
+flora-cultivator-mk04=Florateler MK 04
+aai-shunt-loader=Shuntlader
+shunt-inserter=Shuntrobotarm
+
+[entity-name-alt]
+# just the normal names for these things
+ddc-mk00=Destructieve-destilatiekolom MK 00
+soil-extractor-mk00=Aardeonttrekker MK 00
+solid-separator-mk00=Vaste Stoffen Scheider MK 00
+burner-quenching-tower=Stoomaangedreven Blustoren
+washer-mk00=Wasser MK 00
+wpu-mk00=Houtverwerkingseenheid MK 00
+atomizer-mk00=Verstuiver MK 00
+automated-screener-mk00=Geautomatiseerde Zeefmachine MK 00
+slaughterhouse-mk00=Slachthuis MK 00
+fwf-mk00=Snelhoutbosbouw MK 00
+compost-plant-mk00=Compostfabriek MK 00
+
+[technology-name]
+atomizer-mk00=Vroege Moleculaire Decohesie
+pumping-productivity=Pompproductiviteit
+
+[modifier-description]
+change-recipe-productivity=Mijnproductiviteit: +10%
+
+[mod-setting-name]
+disable-pyblock-fun-names=Alternatieve MK 00 namen uitzetten
+
+[mod-setting-description]
+disable-pyblock-fun-names=Waarom zou je zoiets doen?
+
+[noise-expression]
+pyblock_island=PyBlock Eiland
+pyblock_classic=PyBlock Enkele Tegel
+pyblock_archipeligo=PyBlock Archipel
+
+[map-gen-preset-name]
+pyblock-recommended=PyBlock Aangeraden
+pyblock-classic=PyBlock Klassiek
+pyblock-archipeligo=PyBlock Archipel
+
+[map-gen-preset-description]
+pyblock-recommended=Dit zijn de aangeraden instellingen om PyBlock mee te spelen. Grondstoffen, bomen, rotsen, kliffen en het meeste land is uitgeschakeld.\nAls je met meer land wil spelen, kan je de eilandgrootte verhogen of omschakelen naar normale terreingeneratie.
+pyblock-classic=Dit is klassiek PyBlock. Grondstoffen, bomen, rotsen, kliffen en het meeste land is uitgeschakeld. Je begint op één tegel van grondstort en moet terwijl je bezig bent de wereld bouwen.\nAls je met meer land wil spelen, kan je naar PyBlock Aangeraden overschakelen in het keuzemenu hierboven.
+pyblock-archipeligo=Dit is een variatie van PyBlock waarbij kleine eiland genereren, die soms nuttige grondstoffen bevatten, maar het meeste van je productie is afkomstig van normale PyBlockmethoden.
+default=[color=red]Deze optie is niet aangeraden voor PyBlock, overweeg om [/color]PyBlock Aangeraden[color=red] te gebruiken in het keuzemenu hierboven.[/color]
+
+[messages]
+pyblock-warning-no-preset=Het ziet er naar uit dat je niet een "PyBlock" mapgeneratie-instelling gebruikt. PyBlock is ontwikkelend rondom het niet mijnen van grondstoffen, maar het is nog steeds speelbaar op een normale kaart.\nAls je nog steeds grondstoffen wil delfen terwijl je PyBlock speelt, bekijk dan de PyBlock Archipel optie.
+pyblock-intro=Je bent op een planeet die bijna compleet uit water bestaat neergestort. Melon was een beetje wild met nucleaire artillerie...\nAlles is weg, maar je bent nu hier. Misschien ben je ten dode opgeschreven... of misschien is hier genoeg om te overleven.
diff --git a/locale/ru/locale.cfg b/locale/ru/locale.cfg
@@ -33,30 +33,51 @@ sap-cultivation=Извлечение живицы
 
 [entity-name]
 driftwood=Коряга
-ddc-mk00=Колонна деструктивной дистилляции MK0
+ddc-mk00=Колонна диструктивной дистилляции МК0
+soil-extractor-mk00=Извлекатель грусти МК0
+solid-separator-mk00=Сепаратор твордых чистиц МК0
+burner-quenching-tower=Закалочная башня с паровым приводом
+washer-mk00=Желалка МК0
+wpu-mk00=Лисапилка МК0
+atomizer-mk00=Автомайзер МК0
+automated-screener-mk00=Автоматический крикун МК0
+slaughterhouse-mk00=Смехобойня МК0
+fwf-mk00=Медленное лесничество МК0
+compost-plant-mk00=Сжигательный завод МК0
+flora-cultivator-mk01=Культиватор флоры МК1
+flora-cultivator-mk02=Культиватор флоры МК2
+flora-cultivator-mk03=Культиватор флоры МК3
+flora-cultivator-mk04=Культиватор флоры МК4
+aai-shunt-loader=Шунтовый погрузчик
+shunt-inserter=Шунтовый манипулятор
+
+[entity-name-alt]
+driftwood=Коряга
+ddc-mk00=Колонна деструктивной дистилляции МК0
 soil-extractor-mk00=Извлекатель грунта МК0
-solid-separator-mk00=Сепаратор твёрдых частиц MK0
+solid-separator-mk00=Сепаратор твёрдых частиц МК0
 burner-quenching-tower=Закалочная башня с паровым приводом
 washer-mk00=Промывка МК0
-wpu-mk00=Блок обработки данных MK0
+wpu-mk00=Лесопилка МК0
 atomizer-mk00=Атомайзер МК0
-automated-screener-mk00=Автоматизированный скример MK0
-slaughterhouse-mk00=Скотобойня MK0
-fwf-mk00=Медленное лесоводство MK0
-compost-plant-mk00=Мусоросжигательный завод МК0
-flora-cultivator-mk01=Культиватор флоры MK1
-flora-cultivator-mk02=Культиватор флоры MK2
-flora-cultivator-mk03=Культиватор флоры MK3
-flora-cultivator-mk04=Культиватор флоры MK4
-aai-shunt-loader=Шунтовый погрузчик
-shunt-inserter=Шунтовый манипулятор
+automated-screener-mk00=Автоматический просеиватель МК0
+slaughterhouse-mk00=Скотобойня МК0
+fwf-mk00=Лесничество МК0
+compost-plant-mk00=Компостная установка МК0
 
 [technology-name]
 atomizer-mk00=Ранняя молекулярная декогезия
+pumping-productivity=Продуктивность выкачивания
 
 [modifier-description]
 change-recipe-productivity=Продуктивность добычи: +10%
 
+[mod-setting-name]
+disable-pyblock-fun-names=Отключить альтернативные названия МК0
+
+[mod-setting-description]
+disable-pyblock-fun-names=Зачем вам это делать?
+
 [noise-expression]
 pyblock_island=PyBlock: Остров
 pyblock_classic=PyBlock: Одна клетка

diff --git a/prototypes/buildings/shunt-loader.lua b/prototypes/buildings/shunt-loader.lua
@@ -1,3 +1,5 @@
+if not mods["aai-loaders"] then return end
+
 AAILoaders.make_tier{
   name = "shunt",
   transport_belt 	= "transport-belt",