Initial 1.7 conversion stuff; TODO: networking and item ids -> names
Merge branch 'master' of https://github.com/squeek502/SpiceOfLife into 1.7

Conflicts:
	java/squeek/spiceoflife/ModConfig.java
Merge branch 'master' of https://github.com/squeek502/SpiceOfLife into 1.7

Conflicts:
	java/squeek/spiceoflife/ModSpiceOfLife.java
	java/squeek/spiceoflife/foodtracker/FoodTracker.java
1.7 implementation of version-specific things + misc 1.7 fixes
 * Compiles, still TODO: update ASM plugin
More 1.7 compatibility fixes
Merge branch 'master' of https://github.com/squeek502/SpiceOfLife into 1.7
Merge branch 'master' of https://github.com/squeek502/SpiceOfLife into 1.7

Conflicts:
	java/squeek/spiceoflife/ModSpiceOfLife.java
	java/squeek/spiceoflife/gui/HUDOverlayHandler.java
	java/squeek/spiceoflife/gui/TooltipOverlayHandler.java
Updated obfuscated names of GuiContainer.theSlot
Updated addDrawHoveringTextHook to get the correct local variables for 1.7
Fixed food history not getting loaded
Merge branch 'master' of https://github.com/squeek502/SpiceOfLife into 1.7

Conflicts:
	java/squeek/spiceoflife/foodtracker/FixedFoodQueue.java
	java/squeek/spiceoflife/foodtracker/FoodHistory.java
Fixed server crash from client-side packet handlers getting registered server-side
Merge branch 'master' of https://github.com/squeek502/SpiceOfLife into 1.7

Conflicts:
	java/squeek/spiceoflife/proxy/ProxyHungerOverhaul.java
Merge branch 'master' of https://github.com/squeek502/SpiceOfLife into 1.7

Conflicts:
	java/squeek/spiceoflife/gui/TooltipOverlayHandler.java
	java/squeek/spiceoflife/proxy/ProxyAgriculture.java
	java/squeek/spiceoflife/proxy/ProxyHungerOverhaul.java
	java/squeek/spiceoflife/proxy/ProxyTiC.java
Merge branch 'master' of https://github.com/squeek502/SpiceOfLife into 1.7

Conflicts:
	java/squeek/spiceoflife/asm/ClassTransformer.java
Actually fixed server crashes from networking stuff
Gooder name for NetworkHelper
Merge branch 'master' of https://github.com/squeek502/SpiceOfLife into 1.7

Conflicts:
	java/squeek/spiceoflife/ModSpiceOfLife.java
	java/squeek/spiceoflife/foodtracker/FoodTracker.java
	java/squeek/spiceoflife/gui/HUDOverlayHandler.java
	java/squeek/spiceoflife/gui/TooltipOverlayHandler.java
	java/squeek/spiceoflife/proxy/ProxyHungerOverhaul.java
Fix for 1.7.10, making this into a 1.7.x version
Merge branch 'master' of https://github.com/squeek502/SpiceOfLife into 1.7.2

Conflicts:
	java/squeek/spiceoflife/gui/TooltipOverlayHandler.java