Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Port to 1.21.1 #240

Open
wants to merge 64 commits into
base: 1.20/dev
Choose a base branch
from
Open

Port to 1.21.1 #240

wants to merge 64 commits into from

Commits on Jun 4, 2024

  1. Port to 1.20.4

    @IThundxr
    IThundxr committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    56b0fce View commit details
    Browse the repository at this point in the history

  2. Obfuscated Obfuscation 

    - Fix ObfuscationReflectionHelper#setPrivateValue using SRG mapped names, Neoforge has switched to mojmap at runtime
    @IThundxr
    IThundxr committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    8c61f3f View commit details
    Browse the repository at this point in the history

  3. fixme fixedme fixed...

    @IThundxr
    IThundxr committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    cbdc318 View commit details
    Browse the repository at this point in the history

  4. port rebase fixes

    @IThundxr
    IThundxr committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    68d40b9 View commit details
    Browse the repository at this point in the history

  5. fix deps

    @IThundxr
    IThundxr committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    25a5522 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2024

  1. fix issues here and there

    @IThundxr
    IThundxr committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    4190ac7 View commit details
    Browse the repository at this point in the history

  2. fix param name

    @IThundxr
    IThundxr committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    52d99e3 View commit details
    Browse the repository at this point in the history

  3. optimize imports

    @IThundxr
    IThundxr committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    47e80a6 View commit details
    Browse the repository at this point in the history

  4. fix mixin

    @IThundxr
    IThundxr committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    349e7b3 View commit details
    Browse the repository at this point in the history

  5. fix param names

    @IThundxr
    IThundxr committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    045771d View commit details
    Browse the repository at this point in the history

  6. fix instance textures

    @IThundxr
    IThundxr committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    a9127be View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2024

  1. Merge branch 'refs/heads/1.20/dev' into feat/multi-loader-1.20.4 

    # Conflicts:
#	gradle.properties
    @IThundxr
    IThundxr committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    a9c4e5c View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2024

  1. build: update dependencies

    @IThundxr
    IThundxr committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    eccbfbc View commit details
    Browse the repository at this point in the history

  2. 1.21 Port I

    @IThundxr
    IThundxr committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    d587ec0 View commit details
    Browse the repository at this point in the history

  3. 1.21 Port II

    @IThundxr
    IThundxr committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    d092417 View commit details
    Browse the repository at this point in the history

  4. 1.21 Port III

    @IThundxr
    IThundxr committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    e374365 View commit details
    Browse the repository at this point in the history

  5. 1.21 Port IV

    @IThundxr
    IThundxr committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    10d032c View commit details
    Browse the repository at this point in the history

  6. 1.21 Port V

    @IThundxr
    IThundxr committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    dfbd451 View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2024

  1. Mixin Fixin'

    @IThundxr
    IThundxr committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    1cce5da View commit details
    Browse the repository at this point in the history

  2. style: javadoc fixes

    @IThundxr
    IThundxr committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    eeb6e0f View commit details
    Browse the repository at this point in the history

  3. string substitution fixes

    @IThundxr
    IThundxr committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    1d9f96a View commit details
    Browse the repository at this point in the history

  4. feat(api): Make PartialModel's use RL's instead of MRL's

    @IThundxr
    IThundxr committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    6533723 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2024

  1. Merge remote-tracking branch 'refs/remotes/upstream/1.20/dev' into fe… 

    …at/multi-loader-1.21
    @IThundxr
    IThundxr committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    246939b View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2024

  1. Merge remote-tracking branch 'refs/remotes/upstream/1.20/dev' into fe… 

    …at/multi-loader-1.21

# Conflicts:
#	common/src/lib/java/dev/engine_room/flywheel/lib/material/Materials.java
#	common/src/lib/java/dev/engine_room/flywheel/lib/model/baked/MeshHelper.java
#	common/src/lib/java/dev/engine_room/flywheel/lib/visual/component/ShadowComponent.java
#	common/src/main/java/dev/engine_room/flywheel/impl/mixin/LevelRendererMixin.java
#	common/src/main/java/dev/engine_room/flywheel/impl/mixin/visualmanage/SectionCompilerMixin.java
#	forge/src/api/java/dev/engine_room/flywheel/api/event/BeginFrameEvent.java
#	forge/src/api/java/dev/engine_room/flywheel/api/event/RenderStageEvent.java
#	forge/src/lib/java/dev/engine_room/flywheel/lib/model/baked/PartialModelEventHandler.java
#	forge/src/main/java/dev/engine_room/flywheel/impl/FlwImplXplatImpl.java
#	forge/src/main/java/dev/engine_room/flywheel/impl/mixin/sodium/ChunkBuilderMeshingTaskMixin.java
    @IThundxr
    IThundxr committed Jul 28, 2024
    Configuration menu
    Copy the full SHA
    5e64224 View commit details
    Browse the repository at this point in the history

  2. merge: post merge fixes & porting

    @IThundxr
    IThundxr committed Jul 28, 2024
    Configuration menu
    Copy the full SHA
    44c2f78 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'refs/remotes/upstream/1.20/dev' into fe… 

    …at/multi-loader-1.21
    @IThundxr
    IThundxr committed Jul 28, 2024
    Configuration menu
    Copy the full SHA
    b55afc9 View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2024

  1. fix(mixins): broken LevelRenderer injector

    @IThundxr
    IThundxr committed Jul 29, 2024
    Configuration menu
    Copy the full SHA
    68393d1 View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2024

  1. fix view -IMS

    @IThundxr
    IThundxr committed Aug 10, 2024
    Configuration menu
    Copy the full SHA
    475b1d8 View commit details
    Browse the repository at this point in the history

  2. uncomment the comments 

    "i commented out the particle stuff for testing something
 uh you can revert that" -IMS
    @IThundxr
    IThundxr committed Aug 10, 2024
    Configuration menu
    Copy the full SHA
    f2c0b79 View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2024

  1. update neoforge & fix mixins

    @IThundxr
    IThundxr committed Aug 11, 2024
    Configuration menu
    Copy the full SHA
    5313585 View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2024

  1. Fix lighting

    @IThundxr
    IThundxr committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    44f045b View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2024

  1. fix jittery visual animations

    @IThundxr
    IThundxr committed Aug 17, 2024
    Configuration menu
    Copy the full SHA
    4e1a4b6 View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2024

  1. Sodium 0.6

    @IThundxr
    IThundxr committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    c32fccc View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2024

  1. iris support

    @IThundxr
    IThundxr committed Aug 23, 2024
    Configuration menu
    Copy the full SHA
    6cf9f36 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/1.20/dev' into feat/multi-load… 

    …er-1.21

# Conflicts:
#	forge/src/main/java/dev/engine_room/flywheel/impl/FlywheelForge.java
    @IThundxr
    IThundxr committed Aug 23, 2024
    Configuration menu
    Copy the full SHA
    a932d5d View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/1.20/dev' into feat/multi-load… 

    …er-1.21

# Conflicts:
#	forge/src/main/java/dev/engine_room/flywheel/impl/FlywheelForge.java
#	forge/src/main/java/dev/engine_room/flywheel/impl/ForgeFlwConfig.java
    @IThundxr
    IThundxr committed Aug 23, 2024
    Configuration menu
    Copy the full SHA
    0919c0f View commit details
    Browse the repository at this point in the history

  4. forge porting

    @IThundxr
    IThundxr committed Aug 23, 2024
    Configuration menu
    Copy the full SHA
    3453715 View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2024

  1. Merge remote-tracking branch 'upstream/1.20/dev' into feat/multi-load… 

    …er-1.21

# Conflicts:
#	buildSrc/build.gradle.kts
#	buildSrc/src/main/kotlin/dev/engine_room/gradle/subproject/SubprojectPlugin.kt
#	forge/build.gradle.kts
#	gradle.properties
#	gradle/wrapper/gradle-wrapper.properties
    @IThundxr
    IThundxr committed Sep 14, 2024
    Configuration menu
    Copy the full SHA
    42290b2 View commit details
    Browse the repository at this point in the history

  2. Add sodium 0.6 compat

    @IThundxr
    IThundxr committed Sep 14, 2024
    Configuration menu
    Copy the full SHA
    fc61ff1 View commit details
    Browse the repository at this point in the history

  3. Fix issues

    @IThundxr
    IThundxr committed Sep 14, 2024
    Configuration menu
    Copy the full SHA
    3176f1d View commit details
    Browse the repository at this point in the history

  4. fix remapping

    @IThundxr
    IThundxr committed Sep 14, 2024
    Configuration menu
    Copy the full SHA
    9365011 View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2024

  1. Merge branch '1.20/dev' into feat/multi-loader-1.21 

    # Conflicts:
#	common/src/lib/java/dev/engine_room/flywheel/lib/model/part/ModelPartConverter.java
#	forge/src/main/java/dev/engine_room/flywheel/impl/ForgeFlwConfig.java
#	gradle.properties
    @IThundxr
    IThundxr committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    e7e3579 View commit details
    Browse the repository at this point in the history

  2. Fix compile errors

    @IThundxr
    IThundxr committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    556e11a View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2024

  1. Merge branch '1.20/dev' into feat/multi-loader-1.21

    @IThundxr
    IThundxr committed Sep 22, 2024
    Configuration menu
    Copy the full SHA
    a3bb585 View commit details
    Browse the repository at this point in the history

  2. port changes to 1.21

    @IThundxr
    IThundxr committed Sep 22, 2024
    Configuration menu
    Copy the full SHA
    42bdd36 View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2024

  1. Merge branch '1.20/dev' into feat/multi-loader-1.21 

    # Conflicts:
#	forge/src/main/java/dev/engine_room/flywheel/impl/ForgeFlwConfig.java
    @IThundxr
    IThundxr committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    08866ed View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2024

  1. post merge fixes

    @IThundxr
    IThundxr committed Oct 5, 2024
    Configuration menu
    Copy the full SHA
    ae4e4e7 View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2024

  1. Fix sprite UVs being messed up

    @IThundxr
    IThundxr committed Oct 6, 2024
    Configuration menu
    Copy the full SHA
    05b82b5 View commit details
    Browse the repository at this point in the history

  2. Fix iris compat

    @IThundxr
    IThundxr committed Oct 6, 2024
    Configuration menu
    Copy the full SHA
    6cc2b74 View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2024

  1. Build against 1.21.1

    @IThundxr
    IThundxr committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    b408191 View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2024

  1. Last fixes

    @IThundxr
    IThundxr committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    93c1163 View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2024

  1. address review

    @IThundxr
    IThundxr committed Oct 12, 2024
    Configuration menu
    Copy the full SHA
    178dd6c View commit details
    Browse the repository at this point in the history

  2. Rename class

    @IThundxr
    IThundxr committed Oct 12, 2024
    Configuration menu
    Copy the full SHA
    6f946fc View commit details
    Browse the repository at this point in the history

  3. post to correct bus

    @IThundxr
    IThundxr committed Oct 12, 2024
    Configuration menu
    Copy the full SHA
    dc3e264 View commit details
    Browse the repository at this point in the history

  4. fix breaks formatting

    @IThundxr
    IThundxr committed Oct 12, 2024
    Configuration menu
    Copy the full SHA
    e39554e View commit details
    Browse the repository at this point in the history

  5. bring back comment

    @IThundxr
    IThundxr committed Oct 12, 2024
    Configuration menu
    Copy the full SHA
    f6ca19c View commit details
    Browse the repository at this point in the history

  6. forgeEventBus -> gameEventBus

    @IThundxr
    IThundxr committed Oct 12, 2024
    Configuration menu
    Copy the full SHA
    68e545b View commit details
    Browse the repository at this point in the history

  7. Remove unused check

    @IThundxr
    IThundxr committed Oct 12, 2024
    Configuration menu
    Copy the full SHA
    aeb9781 View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2024

  1. fix meshemitter

    @IThundxr
    IThundxr committed Oct 14, 2024
    Configuration menu
    Copy the full SHA
    008b098 View commit details
    Browse the repository at this point in the history

  2. formatting changes

    @IThundxr
    IThundxr committed Oct 14, 2024
    Configuration menu
    Copy the full SHA
    fa57f34 View commit details
    Browse the repository at this point in the history

  3. address requested changes

    @IThundxr
    IThundxr committed Oct 14, 2024
    Configuration menu
    Copy the full SHA
    c705fdf View commit details
    Browse the repository at this point in the history

  4. address requested changes

    @IThundxr
    IThundxr committed Oct 14, 2024
    Configuration menu
    Copy the full SHA
    68d1504 View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2024

  1. Merge remote-tracking branch 'upstream/1.20/dev' into feat/multi-load… 

    …er-1.21

# Conflicts:
#	common/src/lib/java/dev/engine_room/flywheel/lib/util/ShadersModHandler.java
#	common/src/main/java/dev/engine_room/flywheel/impl/FlwImplXplat.java
#	common/src/main/java/dev/engine_room/flywheel/impl/compat/SodiumCompat.java
#	common/src/main/java/dev/engine_room/flywheel/impl/mixin/BlockEntityTypeMixin.java
#	fabric/build.gradle.kts
#	fabric/src/main/java/dev/engine_room/flywheel/impl/FlwImplXplatImpl.java
#	fabric/src/main/java/dev/engine_room/flywheel/impl/FlwLibXplatImpl.java
#	fabric/src/main/java/dev/engine_room/flywheel/impl/mixin/sodium/ChunkBuilderMeshingTaskMixin.java
#	fabric/src/main/java/dev/engine_room/flywheel/impl/mixin/sodium/SodiumMixinPlugin.java
#	fabric/src/main/resources/fabric.mod.json
#	forge/build.gradle.kts
#	forge/src/main/java/dev/engine_room/flywheel/impl/FlwImplXplatImpl.java
#	forge/src/main/java/dev/engine_room/flywheel/impl/FlwLibXplatImpl.java
#	forge/src/main/java/dev/engine_room/flywheel/impl/FlywheelForge.java
#	forge/src/main/resources/META-INF/neoforge.mods.toml
#	gradle.properties
#	gradle/wrapper/gradle-wrapper.properties
    @IThundxr
    IThundxr committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    07e66bb View commit details
    Browse the repository at this point in the history

  2. post merge fixes

    @IThundxr
    IThundxr committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    ad93839 View commit details
    Browse the repository at this point in the history