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: Maingol/Grasscutter
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: development
Choose a base ref
...
head repository: Grasscutters/Grasscutter
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: development
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 12 commits
  • 19 files changed
  • 12 contributors

Commits on Dec 1, 2023

  1. Bump to version 1.7.4

    @KingRainbow44
    KingRainbow44 committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    5ebad71 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2023

  1. Fix some more dungeons (Grasscutters#2449) 

    * Monds weapon mats domain: Fix time between kill not refreshing
* Inaz husk domain: Fix broken domain challenge
    * `EVENT_ANY_MONSTER_LIVE` is likely sent on tick, not on create. See scene40801_group240801001.lua:
        1. `condition_EVENT_ANY_MONSTER_LIVE_1023` checks for mob 1008 to spawn AND for variable `challenge` to be 1
        2. Mob 1008 spawns during `action_EVENT_SELECT_OPTION_1003`, at `ScriptLib.AddExtraGroupSuite(context, 240801001, 2)`
        3. This spawn triggers `EVENT_ANY_MONSTER_LIVE` for mob 1008 but still fails the condition because `challenge` is still 0.
        4. `challenge` is set to 1 at the end of `action_EVENT_SELECT_OPTION_1003`. By now, `EVENT_ANY_MONSTER_LIVE` for mob 1008 no longer fires, causing the domain challenge to fail to start.
    @longfruit
    longfruit authored Dec 14, 2023
    Configuration menu
    Copy the full SHA
    c4402cc View commit details
    Browse the repository at this point in the history

  2. Format code [skip actions]

    @github-actions
    github-actions[bot] committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    770a793 View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2024

  1. Update client link (Grasscutters#2470)

    @NotThorny
    NotThorny authored Jan 19, 2024
    Configuration menu
    Copy the full SHA
    9e17e4a View commit details
    Browse the repository at this point in the history

  2. Add documentation on 404 error page. (Grasscutters#2463) 

    * Update HttpServer.java

* Update HttpServer.java

---------

Co-authored-by: Magix <[email protected]>
    @root-mega @KingRainbow44
    root-mega and KingRainbow44 authored Jan 19, 2024
    Configuration menu
    Copy the full SHA
    6e1913a View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2024

  1. add some client download link and fix readme (Grasscutters#2475) 

    * Update README.md

* Update README_zh-CN.md

* Update README_hn-IN.md
    @Gaobaiawa
    Gaobaiawa authored Mar 17, 2024
    Configuration menu
    Copy the full SHA
    eeaccf3 View commit details
    Browse the repository at this point in the history

  2. Add Docker Support (Grasscutters#2486) 

    * chore(docker): add build workflow

* chore(docker): update gradle image

* chore(docker): this really shouldnt be running on raspberry pi's right now.

* chore(docker): not sure why we need unzip here

* chore(docker): attempt to add nodejs to allow the handbook to build

* chore(docker): whoops, needs to be done during build

* chore(docker): i dont know if this is going to work

* chore(docker): replace my username with repo org as I am no longer testing this

* chore(docker): version will change in the future, so fix it now.
    @kashalls
    kashalls authored Mar 17, 2024
    Configuration menu
    Copy the full SHA
    f871f26 View commit details
    Browse the repository at this point in the history

  3. (fix:docker) Fix uploading to container registry

    @KingRainbow44
    KingRainbow44 authored Mar 17, 2024
    Configuration menu
    Copy the full SHA
    f1f5b54 View commit details
    Browse the repository at this point in the history

Commits on May 14, 2024

  1. Configuration Update - Shown Email (Grasscutters#2509) 

    * This version will allow the private server owner to show a different email then "@grasscutter.io" if they want.

* Update src/main/java/emu/grasscutter/config/ConfigContainer.java

Co-authored-by: Magix <[email protected]>

* Update src/main/java/emu/grasscutter/game/Account.java

Co-authored-by: Magix <[email protected]>

* Update src/main/java/emu/grasscutter/game/Account.java

Co-authored-by: Magix <[email protected]>

---------

Co-authored-by: Magix <[email protected]>
    @KIttenPixel @KingRainbow44
    KIttenPixel and KingRainbow44 authored May 14, 2024
    Configuration menu
    Copy the full SHA
    4022267 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2024

  1. Update README_ja-JP.md (Grasscutters#2516)

    @Ign1s-Reiga
    Ign1s-Reiga authored Jun 6, 2024
    Configuration menu
    Copy the full SHA
    76fd5b2 View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2024

  1. Fix cannot stop in dispatch-only mode (Grasscutters#2534)

    @jie65535
    jie65535 authored Nov 19, 2024
    Configuration menu
    Copy the full SHA
    d340758 View commit details
    Browse the repository at this point in the history

Commits on Nov 23, 2024

  1. Update code of conduct reference (Grasscutters#2535) 

    Signed-off-by: Emmanuel Ferdman <[email protected]>
    @emmanuel-ferdman
    emmanuel-ferdman authored Nov 23, 2024
    Configuration menu
    Copy the full SHA
    9c36daa View commit details
    Browse the repository at this point in the history
Loading