Merge remote-tracking branch 'origin/1.18/dev' into 1.18/fabric/dev

Conflicts:
	src/main/resources/META-INF/mods.toml
This commit is contained in:
PepperCode1 2023-01-26 11:17:06 -08:00
commit 59c11949e8
3 changed files with 3 additions and 2 deletions

View file

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

View file

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

View file

@ -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()) {