Merge branch '1.18/dev' into 1.19/dev

Conflicts:
	gradle.properties

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -59,6 +59,7 @@ body:
             label: Mod Version
             description: The version of the mod you were using when the bug occured
             options:
+                - "0.6.8.a"
                 - "0.6.8"
                 - "0.6.7"
                 - "0.6.6"

changelog.txt

@@ -1,3 +1,28 @@
+0.6.8:
+Fixes
+ - Fix colored vertices being incorrectly rendered through instancing
+ - Fix some miscellaneous bugs with sodium/rubidium
+ - Fix memory leak associated with model storage
+Technical/API
+ - Memory for models is freed when they are no longer in use
+ - Element buffers now deal in raw gl handles
+ - Element buffers are no longer considered part of state resoration
+ - Quad -> Tri element buffer properly resets itself
+
+0.6.7:
+...is 1.19 only :ioa:
+
+0.6.6:
+Fixes
+ - Fix instanced entities not rendering correctly when chunk loading is slow
+Technical/API
+ - GL state is more reliably managed
+ - Slight memory improvements when using Iris/Oculus through lazy instatiation
+
+0.6.5:
+Fixes
+ - Fix crash with batching backend and Rubidium
+
 0.6.4:
 Fixes
  - Fix shader detection with oculus

gradle.properties

@@ -2,7 +2,7 @@ org.gradle.jvmargs = -Xmx3G
 org.gradle.daemon = false
 
 # mod version info
-mod_version = 0.6.8
+mod_version = 0.6.8.a
 artifact_minecraft_version = 1.19.2
 
 minecraft_version = 1.19.2

src/main/java/com/jozufozu/flywheel/backend/model/IndexedModel.java

@@ -40,7 +40,7 @@ public class IndexedModel implements BufferedModel {
 
 		vbo.bind();
 		// allocate the buffer on the gpu
-		vbo.ensureCapacity(model.size());
+		vbo.ensureCapacity(type.byteOffset(model.vertexCount()));
 
 		// mirror it in system memory, so we can write to it, and upload our model.
 		try (MappedBuffer buffer = vbo.getBuffer()) {

src/main/resources/META-INF/mods.toml

@@ -10,7 +10,7 @@ version = "${file.jarVersion}"
 displayName = "Flywheel"
 logoFile = "logo.png"
 displayURL = "https://www.curseforge.com/minecraft/mc-mods/flywheel"
-updateJSONURL = "https://api.modrinth.com/updates/5lpsZoRi/forge_updates.json"
+updateJSONURL = "https://api.modrinth.com/updates/flywheel/forge_updates.json"
 authors = "Jozufozu"
 description = '''
 A modern engine for modded minecraft.'''