xircon/Hbm-s-Nuclear-Tech-GIT
1
0
Fork 0
mirror of https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git synced 2026-01-25 10:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Bob 2023-11-06 18:52:24 +01:00
parent 1332f14429
commit bfb45399dd
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changelog
View File

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