Merge branch 'dev' of https://github.com/alex-lawson/sb-automation.git into HEAD
Removed most magnets, remaining magnet still WIP
Merge branch 'dev' of https://github.com/alex-lawson/sb-automation.git into HEAD

Conflicts:
	recipes_creative/ptmagnetblocknegneutstrong.recipe
	recipes_creative/ptmagnetblocknegneutweak.recipe
	recipes_creative/ptmagnetblockposnegstrong.recipe
	recipes_creative/ptmagnetblockposneutstrong.recipe
	recipes_creative/ptmagnetblockposneutweak.recipe
	recipes_creative/ptmagnetblockposstrong.recipe
Added powered and permanent strong and weak magnets
Made magnetizer consume energy per monster magnetized, and added duration
Merge branch 'dev' of https://github.com/alex-lawson/sb-automation.git into dev-magnets
Slightly organized magnet directory structure, added advanced electromagnets
fixed some animations, did some refactoring, hopefully didn't break anything
just can't get that damn animation fixed... gotta wait for the patch
Merge branch 'dev-energy' into dev
Merge branch 'dev-magnets' into dev
spent WAY too much time on battery graphics
quote unquote final battery and charger graphics
added discharge mode for battery holder but found issue with energy.lua algorithm... bleh
added placeholder objects for basic and advanced generators
added placeholder object and recipe for powered smelter
Merge branch 'dev-pipes' into dev
Merge branch 'dev-energy' into dev
Liquid tank now displays proper liquid contents