Stuff, no breaking, please!
ignoring config folder
Merge branch 'master' of https://github.com/Jam-Craft/ChowTime into Sor1n

Conflicts:
	.gitignore
Stuff
Merge branch 'master' of https://github.com/Jam-Craft/ChowTime

Conflicts:
	src/main/java/net/jamcraft/chowtime/ChowTime.java

	src/main/java/net/jamcraft/chowtime/core/gen/candyLand/WorldProviderCandyLand.java
... I'm awake, i think
Merging
these can be overwritten
Merge branch 'master' of https://github.com/Jam-Craft/ChowTime

Conflicts:
	src/main/java/net/jamcraft/chowtime/ChowTime.java
	src/main/java/net/jamcraft/chowtime/core/CTRegistry.java

	src/main/java/net/jamcraft/chowtime/core/gen/candyLand/WorldProviderCandyLand.java
Harvesting XP and LEVELS
Merge branch 'master' of https://github.com/Jam-Craft/ChowTime into DarkKnight

Conflicts:
	src/main/java/net/jamcraft/chowtime/core/CTRegistry.java
Merge branch 'allout'
Remove run stuff and update .gitignore
Trying to fix textures. Also, can we start having proper names?
Merge branch 'master' of https://github.com/Jam-Craft/ChowTime into DarkKnight
Merge