Jozufozu
3dd74fe4b2
Merge branch '1.18/dev' into 1.18/next
...
# Conflicts:
# .github/ISSUE_TEMPLATE/bug_report.yml
# build.gradle
# gradle.properties
# src/main/java/com/jozufozu/flywheel/api/Material.java
# src/main/java/com/jozufozu/flywheel/backend/gl/GlStateTracker.java
# src/main/java/com/jozufozu/flywheel/backend/gl/buffer/MappedBuffer.java
# src/main/java/com/jozufozu/flywheel/backend/instancing/InstanceManager.java
# src/main/java/com/jozufozu/flywheel/backend/instancing/batching/BatchedMaterial.java
# src/main/java/com/jozufozu/flywheel/backend/instancing/batching/BatchedMaterialGroup.java
# src/main/java/com/jozufozu/flywheel/backend/instancing/batching/BatchingEngine.java
# src/main/java/com/jozufozu/flywheel/backend/instancing/batching/CPUInstancer.java
# src/main/java/com/jozufozu/flywheel/backend/instancing/entity/EntityInstanceManager.java
# src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/ElementBuffer.java
# src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/GPUInstancer.java
# src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/InstancedMaterial.java
# src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/InstancedMaterialGroup.java
# src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/InstancingEngine.java
# src/main/java/com/jozufozu/flywheel/backend/model/ArrayModelRenderer.java
# src/main/java/com/jozufozu/flywheel/backend/model/FallbackAllocator.java
# src/main/java/com/jozufozu/flywheel/backend/model/IndexedModel.java
# src/main/java/com/jozufozu/flywheel/backend/model/ModelPool.java
# src/main/java/com/jozufozu/flywheel/backend/model/VBOModel.java
# src/main/java/com/jozufozu/flywheel/core/QuadConverter.java
# src/main/java/com/jozufozu/flywheel/core/crumbling/CrumblingGroup.java
# src/main/java/com/jozufozu/flywheel/core/crumbling/CrumblingRenderer.java
# src/main/java/com/jozufozu/flywheel/core/hardcoded/ModelPart.java
# src/main/java/com/jozufozu/flywheel/core/model/BlockModel.java
# src/main/java/com/jozufozu/flywheel/core/model/Model.java
# src/main/java/com/jozufozu/flywheel/core/model/WorldModelBuilder.java
# src/main/java/com/jozufozu/flywheel/core/vertex/AbstractVertexList.java
# src/main/java/com/jozufozu/flywheel/core/vertex/BlockVertexList.java
# src/main/java/com/jozufozu/flywheel/event/ForgeEvents.java
# src/main/java/com/jozufozu/flywheel/mixin/ClientMainMixin.java
# src/main/java/com/jozufozu/flywheel/mixin/LevelRendererMixin.java
# src/main/resources/flywheel.mixins.json
2023-03-28 13:22:53 -07:00
PepperCode1
f6d5ed01e7
A bit of backporting
...
- Backport general changes from 1.19
- Fix Javadoc of PartialModel
- Remove default Model#getType implementation
- Increment version to 0.6.8
- Update Parchment
2022-11-10 16:30:30 -08:00
Jozufozu
f84b169bd7
Indirectly packed
...
- Use glsl structs to pack vec/mat data in ssbos
- Support RenderStages
- Dynamically sized draw storage
2022-08-21 16:47:15 -07:00
Jozsef
3f03d1f071
Fix else formatting
2021-06-30 13:03:02 -07:00
Jozsef
f615825846
Pre-port tasks I
...
- Rename Client to FlywheelClient
- Remove Shadow plugin
- Remove generated source set
- Remove unused properties in gradle.properties
- Organize all imports
- Thanks for the list pepper!
2021-06-30 12:43:54 -07:00
zelophed
2442e3ac00
merge & comment cleanup
2021-05-03 18:25:57 +02:00
simibubi
edb1b59f41
Housekeeping
...
- Added an .editorconfig
- Auto-Reformatted most .java files
- Auto-Organized Imports
2021-04-08 19:22:11 +02:00
