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

Lootscript #95

Merged
merged 15 commits into from
Nov 26, 2023
Merged

Lootscript #95

merged 15 commits into from
Nov 26, 2023

Conversation

Wong-Innovations
Copy link
Collaborator

Fixes for loot compat not reloading as well as conflicts with other mods.

@Wong-Innovations Wong-Innovations self-assigned this Nov 21, 2023
Merge branch 'master' of https://github.com/CleanroomMC/GroovyScript …
37fdcad 
…into lootscript

# Conflicts:
#	src/main/java/com/cleanroommc/groovyscript/event/EventHandler.java
#	src/main/java/com/cleanroommc/groovyscript/gameobjects/GameObjectHandlers.java
brachy84
brachy84 approved these changes Nov 26, 2023
View reviewed changes
Copy link
Member

@brachy84 brachy84 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Im still not happy about the closure param txpes situation, but well figure that out in the future

@brachy84 brachy84 merged commit e004ddc into master Nov 26, 2023
1 check passed
@brachy84 brachy84 deleted the lootscript branch November 26, 2023 08:34
@brachy84 brachy84 mentioned this pull request Nov 26, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@brachy84 brachy84 brachy84 approved these changes

Assignees

@Wong-Innovations Wong-Innovations

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Wong-Innovations @brachy84