Merge branch '1.12.2' into 1.12.2-dev

src/main/java/electroblob/wizardry/spell/IceAge.java

@@ -149,7 +149,7 @@ public class IceAge extends Spell {
 							world.setBlockState(pos.down(), Blocks.OBSIDIAN.getDefaultState());
 						}else if(world.getBlockState(pos.down()) == Blocks.FLOWING_LAVA.getDefaultState()){
 							world.setBlockState(pos.down(), Blocks.COBBLESTONE.getDefaultState());
-						}else{
+						}else if(Blocks.SNOW_LAYER.canPlaceBlockAt(world, pos)){
 							world.setBlockState(pos, Blocks.SNOW_LAYER.getDefaultState());
 						}
 					}

src/main/java/electroblob/wizardry/spell/Spell.java

@@ -398,7 +398,7 @@ public abstract class Spell extends IForgeRegistryEntry.Impl<Spell> implements C
 	 */
 	public static Spell get(String name){
 		ResourceLocation key = new ResourceLocation(name);
-		if(key.getResourceDomain().equals("minecraft")) key = new ResourceLocation(Wizardry.MODID, name);
+		if(key.getNamespace().equals("minecraft")) key = new ResourceLocation(Wizardry.MODID, name);
 		return ((ForgeRegistry<Spell>)registry).getValue(key);
 	}