Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Version 1.1.3 patch 1 #965

Merged
merged 118 commits into from
Jan 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
118 commits
Select commit Hold shift + click to select a range
083fcfe
Fixed recipe order of carbon products to correctly display in helmod
LovelySanta Mar 1, 2023
975f920
Another attempt at fixed smoke on the blast furnace
LovelySanta Mar 12, 2023
1a6f27b
Fixed the regular recipe for fiber board was still available when pla…
LovelySanta Mar 14, 2023
11a2103
small tweaks to artifacts
LovelySanta Jun 8, 2023
89d82ed
Format Code
LovelySanta Jun 8, 2023
740cbd7
Add new unit test - redundant recipe unlocks (#910)
KiwiHawk Jun 12, 2023
35a78c5
Format Code
LovelySanta Jun 12, 2023
258d9c7
added support for artifacts outside of bobs enemies
LovelySanta Jun 12, 2023
19ddfd4
partial work on locking artifacts behind tech and some unit test fixes
LovelySanta Jun 14, 2023
7882b57
Format Code
LovelySanta Jun 14, 2023
1584a7e
more tech and unit test work on alien artifacts
LovelySanta Jun 19, 2023
019b6ab
Format Code
LovelySanta Jun 19, 2023
4d87e94
updated gathering turret for artifact rework
LovelySanta Jun 20, 2023
17ad39a
Merge branch 'dev' of https://github.com/Arch666Angel/mods into dev
LovelySanta Jun 20, 2023
fdb1d49
Format Code
LovelySanta Jun 20, 2023
1ca6424
Compatibility with Bob's changes (#911)
KiwiHawk Jun 22, 2023
3813364
Format Code
LovelySanta Jun 22, 2023
f675a97
changes after fixes in modded-factorio/bobsmods#124
LovelySanta Jun 22, 2023
35d959f
more unit test fixes
LovelySanta Jun 22, 2023
929901e
Format Code
LovelySanta Jun 22, 2023
35e3412
Unit test fixes (#912)
KiwiHawk Jun 23, 2023
46bc2dd
Format Code
LovelySanta Jun 23, 2023
e8e05bf
Increase the tech tier of Chrome and Platinum (#909)
KiwiHawk Jun 26, 2023
d85f1f2
Fixing radar prerequisites (#913)
KiwiHawk Jun 26, 2023
c7481c1
updated last of bobs enemies and spawners (#748)
LovelySanta Jun 27, 2023
0e30988
Format Code
LovelySanta Jun 27, 2023
e42b15b
Fixed infinite Bob ores not being enabled (#914)
KiwiHawk Jun 29, 2023
af58f5b
Fixing more unit test errors (#916)
KiwiHawk Jul 11, 2023
98e1613
Format Code
LovelySanta Jul 11, 2023
5e577ca
Limit buffer for gardens (#918)
KiwiHawk Jul 16, 2023
71ae22b
Electro refining tier (#917)
KiwiHawk Jul 25, 2023
7b8588f
Format Code
LovelySanta Jul 25, 2023
d84293a
Prerequisite tweaks & other small changes (#919)
KiwiHawk Jul 25, 2023
9097c52
Format Code
LovelySanta Jul 25, 2023
fb81d0e
Paper 2 rework (#922)
KiwiHawk Aug 12, 2023
7d5d567
Bob's Electronic Assembling Machines Recipe Categories (#921)
KiwiHawk Aug 12, 2023
1413b21
Format Code
LovelySanta Aug 12, 2023
b6d117e
Added configurable triggers for acetone and urea (#924, #928)
KiwiHawk Aug 21, 2023
444ed8e
Paper and pulp recipes rebalancing (#923)
KiwiHawk Aug 22, 2023
d2e276c
Recipe productivity for glass and thorium (#929)
KiwiHawk Aug 22, 2023
cd87952
ignore Thumbs.db (#930)
SunSerega Aug 26, 2023
3b7697f
Earlier wood production (#932)
KiwiHawk Sep 15, 2023
2130a99
Format Code
LovelySanta Sep 15, 2023
7159bfb
Added custom message when trying to insert an invalid item into a "fu…
KiwiHawk Sep 18, 2023
9b9245c
fixed syntax error
LovelySanta Sep 18, 2023
29bcfbe
Bob's processing tech names (#935)
KiwiHawk Sep 18, 2023
e0f2140
Fixed bob's Resin not being replaced (#934)
KiwiHawk Sep 20, 2023
cc71dd4
Format Code
LovelySanta Sep 20, 2023
7fbf87e
Bob's Mods / Agriculture Modules compatibility (#938)
KiwiHawk Sep 25, 2023
438d65c
Format Code
LovelySanta Sep 25, 2023
a279812
Updating glass fiber casting recipes (#939)
KiwiHawk Oct 2, 2023
b390356
Fix unused property warnings (#940)
KiwiHawk Oct 5, 2023
66253b8
Earlier wood production
KiwiHawk Sep 5, 2023
2089ff7
Moved Composter to it's own tech #932
KiwiHawk Sep 13, 2023
a0351e8
Remove paper to wooden boards recipe
KiwiHawk Sep 13, 2023
86c6235
Update phenolic board recipe to use paper
KiwiHawk Sep 13, 2023
be66cc8
Check if tech exists before adding prereq
KiwiHawk Sep 13, 2023
13a88a9
Remove paper to wooden boards recipe
KiwiHawk Sep 15, 2023
97e31ec
Updating changelog
KiwiHawk Sep 22, 2023
c1c4f60
Remove execute() statement
KiwiHawk Sep 24, 2023
6edcae7
Make composting ignore tech cost multiplier
KiwiHawk Oct 6, 2023
34a0018
Set paper trigger
KiwiHawk Oct 8, 2023
6c4ffed
Paper 1 no long needs to ignore tech cost multiplier
KiwiHawk Oct 8, 2023
008dc5a
Fix gardens prerequisites
KiwiHawk Oct 8, 2023
3550894
Move paper and T1 farming techs up a science pack tier
KiwiHawk Oct 8, 2023
44ab760
Adjust for updated prereq
KiwiHawk Oct 8, 2023
b352271
Fixing steel trigger
KiwiHawk Oct 23, 2023
5abb102
Fixing duplicate fluid product (#942)
KiwiHawk Oct 23, 2023
82d36aa
added electric offshore pump
LovelySanta Oct 23, 2023
0a7329e
Format Code
LovelySanta Oct 23, 2023
5b0ee4d
Prerequisite fixes (#943)
KiwiHawk Nov 16, 2023
ecb0519
Don't overwrite existing recipe builder fallbacks
KiwiHawk Nov 22, 2023
c2e13bd
Updating changelog
KiwiHawk Nov 22, 2023
4bb390f
Switch tech costs
KiwiHawk Nov 22, 2023
131c6d1
Prerequisites and unlocks shuffle
KiwiHawk Nov 22, 2023
85ae4b8
Combine steam cracking techs
KiwiHawk Nov 22, 2023
c166b6d
Merge pull request #950 from KiwiHawk/recipe-builder-overrides
KiwiHawk Nov 25, 2023
315ec81
More tech cleanup
KiwiHawk Nov 28, 2023
ec3fbb2
Merge branch 'dev' into tech-shuffle
KiwiHawk Dec 2, 2023
4ab7c24
Fix paper 2 prerequisites
KiwiHawk Dec 3, 2023
c87f212
Updating changelog
KiwiHawk Dec 11, 2023
b888926
Merge branch 'dev' into wooden-boards
KiwiHawk Dec 11, 2023
fb106b7
Remove productivity from basic board recipes
KiwiHawk Dec 11, 2023
b86d3c1
Fixing missing prerequisite
KiwiHawk Dec 11, 2023
8064223
Prerequisite tweaks
KiwiHawk Dec 12, 2023
a33b375
Merge branch 'tech-shuffle' into wooden-boards
KiwiHawk Dec 12, 2023
1579227
Removing duplicate recipe unlock
KiwiHawk Dec 12, 2023
090c605
Merge branch 'tech-shuffle' into wooden-boards
KiwiHawk Dec 12, 2023
571ab0e
Prereq changes
KiwiHawk Dec 12, 2023
721c150
Prerequisite changes
KiwiHawk Dec 12, 2023
5a717ee
Heavy offshore pump #952
KiwiHawk Dec 12, 2023
12b1b94
Electric waterpump #952
KiwiHawk Dec 13, 2023
0573e6e
Merge branch 'dev' into tech-shuffle
KiwiHawk Dec 14, 2023
1c8a8f9
Merge pull request #951 from KiwiHawk/tech-shuffle
KiwiHawk Dec 14, 2023
e2c63c2
Format Code
KiwiHawk Dec 14, 2023
b5f0f1e
Merge branch 'dev' into wooden-boards
KiwiHawk Dec 14, 2023
ee132e1
Merge branch 'dev' into wooden-boards
KiwiHawk Dec 14, 2023
2f717fe
Merge pull request #936 from KiwiHawk/wooden-boards
KiwiHawk Dec 14, 2023
1fbd8de
Format Code
KiwiHawk Dec 14, 2023
16bfef0
Bob's compatibility #911
KiwiHawk Dec 20, 2023
77c8855
Override Bob's Gilded Wire Name
KiwiHawk Dec 21, 2023
2d4284a
Fix recipe category
KiwiHawk Dec 21, 2023
e1d4684
Merge branch 'master' into dev
LovelySanta Dec 22, 2023
063cb50
Format Code
LovelySanta Dec 22, 2023
e4ccf61
added release dates
LovelySanta Dec 22, 2023
0b52dca
Merge branch 'master' into dev
LovelySanta Dec 22, 2023
7726716
add missing map color for transport drone crash
kingarthur91 Dec 24, 2023
62f7e85
Format Code
kingarthur91 Dec 24, 2023
955b1c2
AAI / Bob's compatibility #960
KiwiHawk Jan 1, 2024
81f0be0
Updating changelog #961
KiwiHawk Jan 1, 2024
2d050cb
Fixing softlock at red electronics #955
KiwiHawk Jan 1, 2024
19dbbb9
Format Code
KiwiHawk Jan 1, 2024
9e58cc6
YAFC compatibility #962
KiwiHawk Jan 1, 2024
41e64d2
Fixing softlock at green circuits #955
KiwiHawk Jan 1, 2024
d7c08ad
Merge branch 'dev' of https://github.com/Arch666Angel/mods into dev
KiwiHawk Jan 1, 2024
403f9d9
AAI Loaders Compatibility #963
KiwiHawk Jan 4, 2024
6a0b511
Adjust paper volume #964
KiwiHawk Jan 4, 2024
a6c17bf
added release date
LovelySanta Jan 4, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions angelsbioprocessing/changelog.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
---------------------------------------------------------------------------------------------------
Version: 0.7.26
Date: 04.01.2024
Changes:
- Adjust paper volume (964):
- Halve the output of the paper recipes
- Halve the amount of paper required for Phenolic boards
Bugfixes:
- Fixed compatibility issue with AAI Industry and Bob's Assembling Machines (960)
---------------------------------------------------------------------------------------------------
Version: 0.7.25
Date: 22.12.2023
Changes:
Expand Down
2 changes: 1 addition & 1 deletion angelsbioprocessing/info.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "angelsbioprocessing",
"version": "0.7.25",
"version": "0.7.26",
"factorio_version": "1.1",
"title": "Angel's Bioprocessing",
"author": "Arch666Angel",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ if bobmods then
})
end

if mods["bobassembly"] and settings.startup["bobmods-assembly-burner"].value == true then
if mods["bobassembly"] and data.raw.technology["basic-automation"] then
OV.remove_prereq("bio-processing-brown", "automation")
OV.add_prereq("bio-processing-brown", "basic-automation")
OV.remove_prereq("basic-chemistry", "automation")
Expand All @@ -81,7 +81,7 @@ if mods["bobelectronics"] then
ingredients = {
{ "!!" },
{ type = "fluid", name = "liquid-resin", amount = 10 },
{ type = "item", name = "solid-paper", amount = 10 },
{ type = "item", name = "solid-paper", amount = 5 },
},
category = "electronics-with-fluid",
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -340,9 +340,9 @@ data:extend({
category = "crafting",
subgroup = "bio-paper",
enabled = false,
energy_required = 4,
energy_required = 8,
ingredients = {
{ type = "item", name = "solid-wood-pulp", amount = 2 },
{ type = "item", name = "solid-wood-pulp", amount = 4 },
},
results = {
{ type = "item", name = "solid-paper", amount = 3 },
Expand All @@ -366,7 +366,7 @@ data:extend({
{ type = "fluid", name = "gas-chlorine", amount = 80 },
},
results = {
{ type = "item", name = "solid-paper", amount = 4 },
{ type = "item", name = "solid-paper", amount = 2 },
{ type = "item", name = "solid-sodium-hypochlorite", amount = 2 },
},
allow_decomposition = false,
Expand Down Expand Up @@ -414,7 +414,7 @@ data:extend({
{ type = "fluid", name = "water", amount = 100 },
},
results = {
{ type = "item", name = "solid-paper", amount = 10 },
{ type = "item", name = "solid-paper", amount = 5 },
{ type = "item", name = "solid-sodium-carbonate", amount = 2 },
{ type = "fluid", name = "gas-oxygen", amount = 40 },
{ type = "fluid", name = "water-yellow-waste", amount = 100 },
Expand Down
10 changes: 10 additions & 0 deletions angelsindustries/changelog.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,14 @@
---------------------------------------------------------------------------------------------------
Version: 0.4.20
Date: 04.01.2024
Changes:
- Compatibility changes for YAFC when Components or Technology Overhauls are enabled (962)
- Science mode:
- Added AAI Loaders compatibility #963
Bugfixes:
- Fixed soft lock when using Components Overhaul (955)
- Fixed compatibility issue with AAI Industry and Bob's Assembling Machines (960)
---------------------------------------------------------------------------------------------------
Version: 0.4.19
Date: 22.12.2023
Changes:
Expand Down
12 changes: 12 additions & 0 deletions angelsindustries/data-final-fixes.lua
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,12 @@ if angelsmods.industries.tech then
"datacore-processing-6",
})
OV.execute()

-- Populate table of starting items for YAFC to read
if data.data_crawler then
data.script_enabled = data.script_enabled or {}
table.insert(data.script_enabled, { type = "item", name = "angels-main-lab-0" })
end
end

--tech updates part 1
Expand All @@ -99,6 +105,12 @@ if angelsmods.industries.components then
angelsmods.functions.AI.add_minable_results()
end
OV.execute()

-- Populate table of starting items for YAFC to read
if data.data_crawler then
data.script_enabled = data.script_enabled or {}
table.insert(data.script_enabled, { type = "item", name = "stone-furnace" })
end
end

--OTHER OVERRIDES
Expand Down
2 changes: 1 addition & 1 deletion angelsindustries/info.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "angelsindustries",
"version": "0.4.19",
"version": "0.4.20",
"factorio_version": "1.1",
"title": "Angel's Industries",
"author": "Arch666Angel",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@ if angelsmods.industries.tech then
OV.remove_prereq("bio-arboretum-temperate-1", "resins")
OV.remove_science_pack("bio-arboretum-temperate-1", "token-bio")
OV.add_prereq("bio-arboretum-temperate-2", "resins")
AI.pack_replace("bio-desert-farming-1", "green", "red")
AI.pack_replace("bio-swamp-farming-1", "green", "red")
AI.pack_replace("bio-temperate-farming-1", "green", "red")
-- INDUSTRIES
AI.pack_replace("tech-green-circuit", "green", "red")
OV.remove_prereq("tech-green-circuit", "resins")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ if angelsmods.industries.tech then
-------------------------------------------------------------------------------
if mods["bobassembly"] then
--assemblers
if settings.startup["bobmods-assembly-burner"].value == true then
if data.raw.technology["basic-automation"] then
AI.core_replace("basic-automation", "processing", "basic")
AI.core_replace("automation", "basic", "processing")
end
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ if angelsmods.industries.tech then
if mods["bobassembly"] then
--adds bobassembly stuffs
-- burner assemblers and/ore tier 1 electric
if settings.startup["bobmods-assembly-burner"].value == true then
if data.raw.technology["basic-automation"] then
AI.pack_replace("basic-automation", "red", "grey")
AI.pack_replace("automation", "grey", "red")
end
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,29 @@ if angelsmods.industries.tech then
AI.pack_replace("warehouse-logistics-research-1", "green", "orange")
end

-------------------------------------------------------------------------------
-- AAI LOADERS ----------------------------------------------------------------
-------------------------------------------------------------------------------
if mods["aai-loaders"] then
AI.core_replace("aai-basic-loader", "basic", "logistic")
AI.core_replace("aai-loader", "basic", "logistic")
AI.core_replace("aai-fast-loader", "basic", "logistic")
AI.core_replace("aai-express-loader", "basic", "logistic")
AI.core_replace("aai-turbo-loader", "basic", "logistic")
AI.core_replace("aai-ultimate-loader", "basic", "logistic")

OV.remove_prereq("aai-express-loader", "advanced-electronics-2")
OV.remove_prereq("aai-express-loader", "production-science-pack")
OV.remove_science_pack("aai-express-loader", "production-science-pack")
OV.remove_science_pack("aai-express-loader", "advanced-logistic-science-pack")
OV.remove_science_pack("aai-turbo-loader", "production-science-pack")
OV.remove_science_pack("aai-turbo-loader", "advanced-logistic-science-pack")
OV.remove_science_pack("aai-ultimate-loader", "production-science-pack")
OV.remove_science_pack("aai-ultimate-loader", "advanced-logistic-science-pack")

AI.pack_replace("aai-fast-loader", "blue", "orange")
end

-------------------------------------------------------------------------------
-- AAI INDUSTRIES -------------------------------------------------------------
-------------------------------------------------------------------------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,16 @@ if angelsmods.industries.components then
OV.add_unlock("bio-paper-1", "circuit-grey-board-alternative")
OV.remove_science_pack("bio-paper-1", "logistic-science-pack")
OV.remove_prereq("bio-paper-1", "logistic-science-pack")
OV.remove_prereq("bio-paper-1", "basic-chemistry")
OV.patch_recipes({
{
name = "solid-wood-pulp",
category = "crafting",
ingredients = {
{ type = "fluid", name = "water", amount = 0 },
},
},
})
OV.execute()

data:extend({
Expand Down
6 changes: 6 additions & 0 deletions angelsrefining/changelog.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
---------------------------------------------------------------------------------------------------
Version: 0.12.6
Date: 04.01.2024
Bugfixes:
- Fixed compatibility issue with AAI Industry and Bob's Assembling Machines (960)
- Fixed compatibility issue with Transport Drones mod (961)
---------------------------------------------------------------------------------------------------
Version: 0.12.5
Date: 22.12.2023
Changes:
Expand Down
2 changes: 1 addition & 1 deletion angelsrefining/info.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "angelsrefining",
"version": "0.12.5",
"version": "0.12.6",
"factorio_version": "1.1",
"title": "Angel's Refining",
"author": "Arch666Angel",
Expand Down
2 changes: 1 addition & 1 deletion angelsrefining/prototypes/buildings/sea-pump.lua
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ data:extend({
},
},
},
--map_color = {0.78, 0.2, 0.77},
map_color = { 0, 0, 0, 0 },
--map_grid = false
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ if mods["bobplates"] then

if mods["bobassembly"] and settings.startup["bobmods-assembly-multipurposefurnaces"].value then
-- keep metal mixing furnaces around
if mods["bobassembly"] and settings.startup["bobmods-assembly-burner"].value == true then
if mods["bobassembly"] and data.raw.technology["basic-automation"] then
OV.add_unlock("basic-automation", "stone-mixing-furnace")
else
OV.add_unlock("automation", "stone-mixing-furnace")
Expand Down
Loading