Auto stash before merge of "master" and "origin/master"

This commit is contained in:
Bob 2023-11-06 18:52:24 +01:00
parent 1332f14429
commit bfb45399dd

View File

@ -1,3 +1,4 @@
<<<<<<< Updated upstream
## Changed
* The wood-burning generator now burns 40mB/s instead of 1mB/s
* Buffed the wood-burning generator's efficiency for fluids from 25% to 50%
@ -6,3 +7,5 @@
## Fixed
* Fixed wood-burning generator being 100x more efficient than it's supposed to be
* Fixed arc welders eating infinite energy
=======
>>>>>>> Stashed changes