|
|
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 |
|
