Theta-Dev a59db99c4f Merge branch 'update_1.8' into 1.15 ... # Conflicts: # README.md # gradle.properties # src/main/java/thetadev/constructionwand/ConstructionWand.java # src/main/java/thetadev/constructionwand/basics/ConfigClient.java # src/main/java/thetadev/constructionwand/basics/ConfigServer.java # src/main/java/thetadev/constructionwand/basics/WandUtil.java # src/main/java/thetadev/constructionwand/client/RenderTypes.java # src/main/java/thetadev/constructionwand/client/ScreenWand.java # src/main/java/thetadev/constructionwand/data/Inp.java # src/main/java/thetadev/constructionwand/data/RecipeGenerator.java # src/main/java/thetadev/constructionwand/items/ItemWand.java # src/main/java/thetadev/constructionwand/items/ItemWandBasic.java # src/main/java/thetadev/constructionwand/items/ItemWandInfinity.java # src/main/java/thetadev/constructionwand/items/ModItems.java # src/main/java/thetadev/constructionwand/job/AngelJob.java # src/main/java/thetadev/constructionwand/job/UndoHistory.java # src/main/java/thetadev/constructionwand/job/WandItemUseContext.java # src/main/java/thetadev/constructionwand/job/WandJob.java # src/main/resources/META-INF/mods.toml		2021-03-14 21:16:06 +01:00
..
resources	Merge branch 'update_1.8' into 1.15	2021-03-14 21:16:06 +01:00