Merge remote-tracking branch 'origin/1.12' into 1.12

src/main/java/tschipp/carryon/common/config/Configs.java

@@ -150,6 +150,21 @@ public class Configs {
     					"thaumcraft:infusion_matrix",
     					"thaumcraft:golem_builder",
     					"thaumcraft:thaumatorium*",
+    					"magneticraft:oil_heater",
+    					"magneticraft:solar_panel",
+    					"magneticraft:steam_engine",
+    					"magneticraft:shelving_unit",
+    					"magneticraft:grinder",
+    					"magneticraft:sieve",
+    					"magneticraft:solar_tower",
+    					"magneticraft:solar_mirror",
+    					"magneticraft:container",
+    					"magneticraft:pumpjack",
+    					"magneticraft:solar_panel",
+    					"magneticraft:refinery",
+    					"magneticraft:oil_heater",
+    					"magneticraft:hydraulic_press",
+    					"magneticraft:multiblock_gap",
     					"refinedstorage:*",
     					"practicallogistics2:*",
     					"mcmultipart:*",

src/main/java/tschipp/carryon/common/event/ItemEvents.java

@@ -268,6 +268,7 @@ public class ItemEvents
 				TileEntity te = world.getTileEntity(pos);
 				if (PickupHandler.canPlayerPickUpBlock(player, te, world, pos))
 				{
+					player.closeScreen();
 
 					if (ItemTile.storeTileData(te, world, pos, state.getActualState(world, pos), stack))
 					{

src/main/java/tschipp/carryon/common/handler/PickupHandler.java

@@ -38,8 +38,6 @@ public class PickupHandler
 		IBlockState state = world.getBlockState(pos);
 		Block block = state.getBlock();
 
-		player.closeScreen();
-
 		NBTTagCompound tag = new NBTTagCompound();
 		if (tile != null)
 			tile.writeToNBT(tag);
@@ -57,7 +55,6 @@ public class PickupHandler
 				{
 					return false;
 				}
-				CarryOn.LOGGER.info("Block is allowed");
 			}
 			else
 			{