Merge branch 'basic_systems'

# Conflicts:
#	src/main/java/carpet/commands/SpawnCommand.java
#	src/main/java/carpet/helpers/CtrlQCrafting.javax
#	src/main/java/carpet/utils/HUDController.java
#	src/main/java/carpet/utils/SpawnReporter.java
#	src/main/resources/carpet.mixins.json

src/main/java/carpet/fakes/ExperienceOrbInterface.java

@@ -0,0 +1,8 @@
+package carpet.fakes;
+
+public interface ExperienceOrbInterface
+{
+    int getCombineDelay();
+    void setCombineDelay(int what);
+    void setAmount(int what);
+}

src/main/java/carpet/fakes/ServerPlayerEntityInterface.java

@@ -0,0 +1,8 @@
+package carpet.fakes;
+
+import carpet.helpers.EntityPlayerActionPack;
+
+public interface ServerPlayerEntityInterface
+{
+    EntityPlayerActionPack getActionPack();
+}