mirror of
https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git
synced 2026-01-25 10:32:49 +00:00
Auto stash before merge of "master" and "origin/master"
This commit is contained in:
parent
1332f14429
commit
bfb45399dd
@ -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%
|
||||
@ -5,4 +6,6 @@
|
||||
|
||||
## Fixed
|
||||
* Fixed wood-burning generator being 100x more efficient than it's supposed to be
|
||||
* Fixed arc welders eating infinite energy
|
||||
* Fixed arc welders eating infinite energy
|
||||
=======
|
||||
>>>>>>> Stashed changes
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user