Skip to content

Commit

Permalink
Merge branch 'master' into Foam-weaponry
Browse files Browse the repository at this point in the history
  • Loading branch information
deltanedas authored Dec 1, 2024
2 parents b6aa851 + 8117ce5 commit b0086c9
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
2 changes: 0 additions & 2 deletions Resources/Maps/pebble.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38710,8 +38710,6 @@ entities:
pos: -24.5,18.5
parent: 2
- type: DeviceNetwork
configurators:
- invalid
deviceLists:
- 326
- 11721
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
tags:
- FirelockElectronics
- type: StaticPrice
price: 5 # DeltaV: made it worthless to prevent factorio
price: 30 # DeltaV: made it worth less than it costs to buy ($38.8) to prevent factorio

0 comments on commit b0086c9

Please sign in to comment.