From 23c0ef6f33c8da000d3315a19dd1bb09b7b917b5 Mon Sep 17 00:00:00 2001 From: Jozufozu Date: Wed, 14 Dec 2022 09:16:21 -0800 Subject: [PATCH 1/3] Update changelog.txt --- changelog.txt | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/changelog.txt b/changelog.txt index c7781fb32..9ccbe5e24 100644 --- a/changelog.txt +++ b/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 From 83a5723420a24112dbd77a02135e710d6b37de2f Mon Sep 17 00:00:00 2001 From: PepperCode1 <44146161+PepperCode1@users.noreply.github.com> Date: Sat, 31 Dec 2022 14:34:59 -0800 Subject: [PATCH 2/3] Fix IndexedModel allocating incorrect amount of bytes - model.size() returned the byte size relative to the model's VertexType, but the byte size relative to the passed VertexType is needed instead --- .../java/com/jozufozu/flywheel/backend/model/IndexedModel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/jozufozu/flywheel/backend/model/IndexedModel.java b/src/main/java/com/jozufozu/flywheel/backend/model/IndexedModel.java index 580ded8b5..7187bb7c0 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/model/IndexedModel.java +++ b/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()) { From f370e85d6d4eeec0ea2d1d858d5fc0ea0b52fa6a Mon Sep 17 00:00:00 2001 From: PepperCode1 <44146161+PepperCode1@users.noreply.github.com> Date: Fri, 13 Jan 2023 16:08:32 -0800 Subject: [PATCH 3/3] Increment version --- .github/ISSUE_TEMPLATE/bug_report.yml | 1 + gradle.properties | 2 +- src/main/resources/META-INF/mods.toml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 468b474f5..3dbe6f0b0 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.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" diff --git a/gradle.properties b/gradle.properties index b43169cd6..c870cce22 100644 --- a/gradle.properties +++ b/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.18.2 minecraft_version = 1.18.2 diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 1ca2ff67b..3ddcc67c7 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/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.'''