Skip to content

Commit

Permalink
Merge branch 'beta' into powder
Browse files Browse the repository at this point in the history
  • Loading branch information
j10a1n15 committed May 30, 2024
2 parents 7c2de0c + 469e618 commit a8b323b
Show file tree
Hide file tree
Showing 392 changed files with 5,044 additions and 1,785 deletions.
1 change: 1 addition & 0 deletions .github/workflows/illegal-imports.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ at/hannibal2/skyhanni/ scala.
at/hannibal2/skyhanni/ jline.
at/hannibal2/skyhanni/ io.github.moulberry.notenoughupdates.util.Constants
at/hannibal2/skyhanni/ io.github.moulberry.notenoughupdates.events.SlotClickEvent
at/hannibal2/skyhanni/ io.github.moulberry.notenoughupdates.events.ReplaceItemEvent
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
.idea/*
!.idea/icon.svg
!.idea/dictionaries/default_user.xml
.vscode/
run/
build/
Expand Down
190 changes: 190 additions & 0 deletions .idea/dictionaries/default_user.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@ format like "- #821" to illustrate the dependency.
- All new classes should be written in Kotlin, with a few exceptions:
- Config files in `at.hannibal2.skyhanni.config.features`
- Mixin classes in `at.hannibal2.skyhanni.mixins.transformers`
- Avoid using deprecated functions.
- These functions are marked for removal in future versions.
- If you're unsure why a function is deprecated or how to replace it, please ask for guidance.
- Future JSON data objects should be made in kotlin and placed in the directory `at.hannibal2.skyhanni.data.jsonobjects`
- Config files should still be made in Java.
- Please use the existing event system, or expand on it. Do not use Forge events.
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ plugins {
}

group = "at.hannibal2.skyhanni"
version = "0.25"
version = "0.26.Beta.4"

val gitHash by lazy {
val baos = ByteArrayOutputStream()
Expand Down
Loading

0 comments on commit a8b323b

Please sign in to comment.