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

some changes and bugfixes, to make pyblock mostly feature complete without ores #26

Open
wants to merge 113 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
113 commits
Select commit Hold shift + click to select a range
131be98
make driftwood functional
protocol-1903 Sep 12, 2024
d392021
updated changelog
protocol-1903 Sep 12, 2024
47a260c
moving seaweed and inserter-fish interaction
protocol-1903 Sep 17, 2024
4d221e9
fixed geothermal plant issues
protocol-1903 Sep 17, 2024
f13560b
moss and sap bootstrapping recipes
protocol-1903 Sep 17, 2024
a858c90
revert fish mk01 changes
protocol-1903 Sep 17, 2024
598021f
put seaweed back into auto sci
protocol-1903 Sep 18, 2024
e10d926
update changelog again
protocol-1903 Sep 18, 2024
8ab9e34
Merge branch 'master' of https://github.com/protocol-1903/PyBlock
protocol-1903 Sep 18, 2024
e5526e3
update changelog
protocol-1903 Sep 18, 2024
9c8776f
allow steampowered washers to be placed adjacent
protocol-1903 Sep 23, 2024
c19d604
re-added power to faw plant and spore collector
protocol-1903 Sep 23, 2024
52f1085
add power draw to faw plantation and spore collector
protocol-1903 Sep 23, 2024
bb6fb8d
make fawogae power a more viable option for early game
protocol-1903 Sep 24, 2024
dc14024
formatting, re-enable native flora in automation science pack
protocol-1903 Sep 24, 2024
4a42f41
update faw to coal recipe for new power options
protocol-1903 Sep 25, 2024
a9253ad
notes
protocol-1903 Sep 25, 2024
78d5490
added cultivator mk1, a way to produce native flora
protocol-1903 Sep 25, 2024
1f8e791
actually enable the cultivator lol
protocol-1903 Sep 25, 2024
5e54f9f
bootstrapping sap produces some wood
protocol-1903 Sep 25, 2024
ae55d28
add fish recipe that does not take lamps
protocol-1903 Sep 25, 2024
cf3f052
yaedols are more difficult to set up
protocol-1903 Sep 25, 2024
4dbadfe
yaedol sample now takes some ingredients from the normal recipe
protocol-1903 Sep 25, 2024
18e242f
first vrauks now require native flora
protocol-1903 Sep 25, 2024
5a6b299
removed fake bioreserve recipe
protocol-1903 Sep 25, 2024
c6695b7
undo bioreserve removal cause it breaks pypp for now
protocol-1903 Sep 25, 2024
c1dcdbf
general changes
protocol-1903 Sep 26, 2024
bd8c886
info.json
protocol-1903 Sep 26, 2024
a93a768
rebuilt tech tree, moved phytomining
protocol-1903 Oct 3, 2024
4f0181f
Merge pull request #1 from protocol-1903/pypp-fix
protocol-1903 Oct 3, 2024
8726626
update changelog
protocol-1903 Oct 3, 2024
7266edb
Merge branch 'master' of https://github.com/protocol-1903/PyBlock
protocol-1903 Oct 3, 2024
41d9a75
update changelog
protocol-1903 Oct 3, 2024
747b414
automated screener to own subgroup
protocol-1903 Oct 5, 2024
c23234d
move faw codex and earth shroom sample to yaedols for real
protocol-1903 Oct 5, 2024
351d354
update pypp resource blacklist, not including kimberlite, oil sand, a…
protocol-1903 Oct 5, 2024
d201748
increment version
protocol-1903 Oct 5, 2024
d2da1b2
move to mk00 subcategory
protocol-1903 Oct 5, 2024
b92ca1e
that was bugging me
protocol-1903 Oct 5, 2024
352fecc
update changelog
protocol-1903 Oct 5, 2024
feec5c9
cultivator localization
protocol-1903 Oct 5, 2024
89328cb
add py1 back to molecular decohesion
protocol-1903 Oct 5, 2024
cc0234b
fish breeding modules fix
protocol-1903 Oct 6, 2024
d47ccaa
itemgroups for mk00 buildings
protocol-1903 Oct 6, 2024
25e8ae7
itemgroups updated again
protocol-1903 Oct 6, 2024
dfde2a1
kimberlite rock from carbon dust
protocol-1903 Oct 6, 2024
0b43b57
buff faw to coal
protocol-1903 Oct 8, 2024
2d44270
soot separation updates
protocol-1903 Oct 8, 2024
ee6422c
increment version
protocol-1903 Oct 8, 2024
83da82c
update cache file
protocol-1903 Oct 8, 2024
1fff990
cultivator updates
protocol-1903 Oct 8, 2024
39fe9da
minor updates, hotfix for 2.0.5
protocol-1903 Oct 8, 2024
cf8e987
date
protocol-1903 Oct 8, 2024
cd8fe04
ignore zip files
protocol-1903 Oct 8, 2024
8122885
hotfix for burner washer
protocol-1903 Oct 8, 2024
343f226
ddc shows fluid connections always
protocol-1903 Oct 20, 2024
edcfbd5
burner and steampowered entities etc
protocol-1903 Oct 20, 2024
6d9fd7f
new mapgen
protocol-1903 Oct 20, 2024
5c02424
too many things to count, but it works
protocol-1903 Oct 27, 2024
b717a04
update changelog
protocol-1903 Oct 27, 2024
b11f170
fawogae with manure fix
protocol-1903 Oct 27, 2024
66b7a47
reduce compost plant cost
protocol-1903 Oct 27, 2024
922c5b1
reduce copper cost for auto sci
protocol-1903 Oct 27, 2024
f387756
increase fish farm cost
protocol-1903 Oct 27, 2024
bb109b0
increase seaweed crop cost
protocol-1903 Oct 27, 2024
c132d89
cultivation locale and sap extraction time
protocol-1903 Nov 1, 2024
dea6387
increase starting logs
protocol-1903 Nov 1, 2024
1f91940
increment version
protocol-1903 Nov 1, 2024
e8583f6
cultivation locale forgot it
protocol-1903 Nov 1, 2024
1878d45
fixed pipe connection alignment
protocol-1903 Nov 1, 2024
72f8fed
remove intermetallics from phytoplankton and move waste water void to…
protocol-1903 Nov 1, 2024
4286e43
increased fluidbox sizes and actually made sprites grey
protocol-1903 Nov 2, 2024
a1f1024
remove old cultivator files
protocol-1903 Nov 2, 2024
24bca34
actually fix cultivation names
protocol-1903 Nov 2, 2024
4691ed3
make spore collector mk01 steampowered again
protocol-1903 Nov 2, 2024
c4934bf
re-added biomass to fish recipes
protocol-1903 Nov 2, 2024
3b9cc1c
moved water animals stage 1 to auto sci
protocol-1903 Nov 2, 2024
9a53e52
fix crash introduced in recent pY updates
protocol-1903 Nov 10, 2024
ea0ce10
fixed driftwood and terrain generation (finally!)
protocol-1903 Nov 11, 2024
ff04221
slaughterhouse mk00
protocol-1903 Nov 11, 2024
e840f04
added support for map setting error message
protocol-1903 Nov 11, 2024
7db030d
update changelog
protocol-1903 Nov 11, 2024
7598395
fixed certain technologies not having prerequesites
protocol-1903 Nov 11, 2024
5903fab
update changelog, and push!!!
protocol-1903 Nov 11, 2024
958660c
fixed jerky being in rendering and not water animals mk01
protocol-1903 Nov 17, 2024
d7d255c
actually move dried meat
protocol-1903 Nov 19, 2024
7813aa0
up driftwood chance
protocol-1903 Nov 24, 2024
5f7fa7d
move faw mk01 closer to start
protocol-1903 Nov 25, 2024
9e31b06
fixed terrain gen, finally
protocol-1903 Nov 25, 2024
86b63b3
change burner entites to mk00 internally
protocol-1903 Nov 25, 2024
b94f11a
remove early auog tech
protocol-1903 Nov 26, 2024
fb26241
correct capitalization on mk00 entities
protocol-1903 Nov 26, 2024
6b43ab2
mostly locale things
protocol-1903 Nov 26, 2024
0a85554
reduce construction costs of soil extractor and washer mk00
protocol-1903 Dec 4, 2024
c245956
double faw plantation speed
protocol-1903 Dec 4, 2024
6ba997c
fixed melamine prereqs
protocol-1903 Dec 4, 2024
75731ae
fixed steam power researching when it doesnt exist. supposedly.
protocol-1903 Dec 11, 2024
b008c6b
wpu and washer fluidbox connections visually offset
protocol-1903 Dec 11, 2024
8d922de
add shunt loader and inserter
protocol-1903 Dec 11, 2024
68ea282
spore collector and compost plant fluidbox connections
protocol-1903 Dec 14, 2024
babf331
cultivator to collector recipes and removing fluidboxes
protocol-1903 Dec 14, 2024
ebbf2bb
wpu and soil extractor vector to place results
protocol-1903 Dec 14, 2024
42dacbd
ddc mk00 show fluidbox connections always
protocol-1903 Dec 14, 2024
40fbfbc
removed washer module slot
protocol-1903 Dec 14, 2024
1c90424
added solid separator mk00
protocol-1903 Dec 15, 2024
0720aef
removed module slots and prevented beacon effects
protocol-1903 Dec 15, 2024
d21e0f6
buff faw to iron
protocol-1903 Dec 15, 2024
7e598af
buff faw with manure
protocol-1903 Dec 15, 2024
d230824
buff jerky recipes in the early fish loop
protocol-1903 Dec 15, 2024
e3a0222
date and PUSH
protocol-1903 Dec 15, 2024
7157a98
actually update shunt inserter locale lol
protocol-1903 Dec 15, 2024
78b1e60
add a single fish turbine to the starting inventory
protocol-1903 Dec 15, 2024
7c323e1
remove old locale
protocol-1903 Dec 15, 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
Prev Previous commit
Next Next commit
wpu and washer fluidbox connections visually offset
  • Loading branch information
protocol-1903 committed Dec 11, 2024
commit b008c6b034b24abb03d1aa81ca9e692cac59afe4
4 changes: 3 additions & 1 deletion changelog.txt
Original file line number Diff line number Diff line change
@@ -19,7 +19,9 @@ Date: ????
Bugfixes:
- Removed automation science pack from Ash Separation technology requirements on tech icon
- Fixed Melamine not requiring Auogs - Stage 1 to be researched
- Fixed "researching" Steam Power even though it is hidden
- Fixed "researching" Steam Power even though it doesn't exist. Or does it?
- Fixed Wood Processing Unit MK 00 fluidbox connections appearing in the wrong place
- Fixed Washer MK 00 fluidbox connections appearing in the wrong place
---------------------------------------------------------------------------------------------------
Version: 3.1.1
Date: 2024-11-26
4 changes: 2 additions & 2 deletions prototypes/buildings/washer-mk00.lua
Original file line number Diff line number Diff line change
@@ -42,8 +42,8 @@ burner_washer.energy_source = {
volume = 200,
pipe_covers = pipecoverspictures(),
pipe_connections = {
{ flow_direction = "input-output", position = {-2.797, 0.5}, direction = 12 },
{ flow_direction = "input-output", position = {2.797, 0.5}, direction = 4 }
{ flow_direction = "input-output", direction = 12, position = { -2.5, 0.5 } },
{ flow_direction = "input-output", direction = 4, position = { 2.5, 0.5 } },
},
filter = "steam",
production_type = "input-output"
4 changes: 2 additions & 2 deletions prototypes/buildings/wpu-mk00.lua
Original file line number Diff line number Diff line change
@@ -56,8 +56,8 @@ ENTITY {
volume = 200,
pipe_covers = pipecoverspictures(),
pipe_connections = {
{ flow_direction = "input-output", position = {-2.8, 0.5}, direction = 12 },
{ flow_direction = "input-output", position = {2.8, 0.5}, direction = 4 }
{ flow_direction = "input-output", direction = 12, position = { -2.5, 0.5 } },
{ flow_direction = "input-output", direction = 4, position = { 2.5, 0.5 } },
},
filter = "steam",
production_type = "input-output",