fixing packages/starting on dabo
working on dabo
Merge branch 'master' of https://github.com/MineTrek/MineTrekCore

Conflicts:
	net/minetrek/CommonProxy.java
	net/minetrek/MineTrek.java
	net/minetrek/blocks/MineTrekBlocks.java
	net/minetrek/blocks/ores/DilithiumOre.java
	net/minetrek/client/ClientProxy.java
	net/minetrek/items/MineTrekItems.java
	net/minetrek/items/ingots/AluminumIngot.java
	net/minetrek/items/ingots/BrassIngot.java
	net/minetrek/items/ingots/BronzeIngot.java
	net/minetrek/items/ingots/ChromiumIngot.java
	net/minetrek/items/ingots/CopperIngot.java
	net/minetrek/items/ingots/DilithiumIngot.java
	net/minetrek/items/ingots/DuraniumIngot.java
	net/minetrek/items/ingots/InvisibleIngot.java
	net/minetrek/items/ingots/IridiumIngot.java
	net/minetrek/items/ingots/PlatinumIngot.java
	net/minetrek/items/ingots/PlutoniumIngot.java
	net/minetrek/items/ingots/SiliconIngot.java
	net/minetrek/items/ingots/SteelIngot.java
	net/minetrek/items/ingots/TinIngot.java
	net/minetrek/items/ingots/TitaniumIngot.java
	net/minetrek/items/ingots/TritaniumIngot.java
	net/minetrek/items/ingots/TungstenIngot.java
	net/minetrek/items/ingots/UraniumIngot.java