aboutsummaryrefslogtreecommitdiff
path: root/src/main/resources/assets
AgeCommit message (Collapse)Author
2021-12-15Merge tag '1.7.21' into unified-build-script2Johann Bernhardt
# Conflicts: # build.properties
2021-12-13Merge tag '1.7.20' into unified-build-script2Johann Bernhardt
# Conflicts: # build.properties # src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluorite.java
2021-12-12Move sources and resourcesJohann Bernhardt