Commit Graph

3 Commits

Author SHA1 Message Date
683cf8d80c fixed merge of texture support 2025-07-12 10:09:20 +02:00
0a0075ce05 Merge branch 'develop-textures' into develop
# Conflicts:
#	.idea/modules.xml
#	src/main/java/eu/mhsl/minecraft/pixelpics/Main.java
#	src/main/java/eu/mhsl/minecraft/pixelpics/render/raytrace/AdvancedRaytracer.java
#	src/main/java/eu/mhsl/minecraft/pixelpics/render/raytrace/DefaultRaytracer.java
#	src/main/java/eu/mhsl/minecraft/pixelpics/render/registry/AdvancedModelRegistry.java
#	src/main/resources/plugin.yml
2025-07-12 10:05:38 +02:00
838eafcf56 renamed project from PixelPic to PixelPics matching name scheme of PixelBlocks 2025-03-21 19:27:58 +01:00