Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: pop4959/Chunky
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: RelativityMC/Chunky
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: reimpl/1
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 12 commits
  • 26 files changed
  • 1 contributor

Commits on Jan 29, 2022

  1. Reimplement things on latest upstream

    @ishland
    ishland committed Jan 29, 2022
    Configuration menu
    Copy the full SHA
    46f77bd View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2022

  1. Some fixes

    @ishland
    ishland committed Mar 19, 2022
    Configuration menu
    Copy the full SHA
    28c1639 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2022

  1. Remove unused invokers and accessors

    @ishland
    ishland committed Jun 25, 2022
    Configuration menu
    Copy the full SHA
    4fc508e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/pop4959/Chunky into reimpl/1

    @ishland
    ishland committed Jun 25, 2022
    Configuration menu
    Copy the full SHA
    e4c663c View commit details
    Browse the repository at this point in the history

Commits on Dec 10, 2022

  1. Merge remote-tracking branch 'upstream/master' into reimpl/1

    @ishland
    ishland committed Dec 10, 2022
    Configuration menu
    Copy the full SHA
    d93b324 View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2023

  1. Merge remote-tracking branch 'upstream/master' into reimpl/1 

    # Conflicts:
#	common/src/main/java/org/popcraft/chunky/GenerationTask.java
#	fabric/src/main/java/org/popcraft/chunky/platform/FabricWorld.java
#	fabric/src/main/resources/fabric.mod.json
    @ishland
    ishland committed Mar 18, 2023
    Configuration menu
    Copy the full SHA
    35f32f8 View commit details
    Browse the repository at this point in the history

  2. fix: merge conflicts and update to 1.19.4

    @ishland
    ishland committed Mar 18, 2023
    Configuration menu
    Copy the full SHA
    b7fd659 View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2023

  1. Merge remote-tracking branch 'upstream/master' into reimpl/1 

    # Conflicts:
#	settings.gradle.kts
    @ishland
    ishland committed Apr 1, 2023
    Configuration menu
    Copy the full SHA
    b39aae9 View commit details
    Browse the repository at this point in the history

Commits on May 31, 2023

  1. change: reenable paper

    @ishland
    ishland committed May 31, 2023
    Configuration menu
    Copy the full SHA
    6a6d3a9 View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2023

  1. fix: shutdown crashes

    @ishland
    ishland committed Jun 17, 2023
    Configuration menu
    Copy the full SHA
    75641ed View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2023

  1. Merge remote-tracking branch 'upstream/master' into reimpl/1

    @ishland
    ishland committed Jun 18, 2023
    Configuration menu
    Copy the full SHA
    9c7bfc7 View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2023

  1. Merge remote-tracking branch 'upstream/master' into reimpl/1

    @ishland
    ishland committed Oct 7, 2023
    Configuration menu
    Copy the full SHA
    723b72d View commit details
    Browse the repository at this point in the history
Loading