Skip to content
History Permalink
  • Lukas's avatar
    Merge remote-tracking branch 'origin/render' into render · 62e1f559
    Lukas authored 
    # Conflicts:
#	src/main/java/de/bixilon/minosoft/data/Mappings.java
#	src/main/java/de/bixilon/minosoft/data/mappings/CustomMapping.java
#	src/main/java/de/bixilon/minosoft/data/mappings/versions/VersionMapping.java
#	src/main/java/de/bixilon/minosoft/data/mappings/versions/Versions.java
    62e1f559