diff options
| author | nextdaydelivery <79922345+nxtdaydelivery@users.noreply.github.com> | 2022-06-05 10:39:49 +0100 |
|---|---|---|
| committer | nextdaydelivery <79922345+nxtdaydelivery@users.noreply.github.com> | 2022-06-05 10:39:49 +0100 |
| commit | 17826161c67f6adf5976d7993ac0a229193e2eb6 (patch) | |
| tree | f4172013d2db0986f0bb123040be1dc5b5823b3d /src/main/kotlin/cc/polyfrost/oneconfig/utils/dsl | |
| parent | 087f5404658a1543834f16a89e3436f8399297f6 (diff) | |
| parent | 72c024213e7c61411ce12f6032f8ef0659408c3a (diff) | |
| download | OneConfig-17826161c67f6adf5976d7993ac0a229193e2eb6.tar.gz OneConfig-17826161c67f6adf5976d7993ac0a229193e2eb6.tar.bz2 OneConfig-17826161c67f6adf5976d7993ac0a229193e2eb6.zip | |
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/main/java/cc/polyfrost/oneconfig/gui/OneConfigGui.java
# src/main/java/cc/polyfrost/oneconfig/gui/animations/EaseInOutQuad.java
# src/main/java/cc/polyfrost/oneconfig/gui/elements/BasicButton.java
# src/main/java/cc/polyfrost/oneconfig/gui/elements/BasicElement.java
# src/main/java/cc/polyfrost/oneconfig/gui/elements/ModCard.java
# src/main/java/cc/polyfrost/oneconfig/gui/elements/text/NumberInputField.java
# src/main/java/cc/polyfrost/oneconfig/lwjgl/image/ImageLoader.java
# src/main/java/cc/polyfrost/oneconfig/utils/GuiUtils.java
# src/main/java/cc/polyfrost/oneconfig/utils/commands/annotations/Command.java
# src/main/java/cc/polyfrost/oneconfig/utils/commands/arguments/ArgumentParser.java
Diffstat (limited to 'src/main/kotlin/cc/polyfrost/oneconfig/utils/dsl')
| -rw-r--r-- | src/main/kotlin/cc/polyfrost/oneconfig/utils/dsl/DSLs.kt | 4 | ||||
| -rw-r--r-- | src/main/kotlin/cc/polyfrost/oneconfig/utils/dsl/NetworkUtilsDSL.kt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/main/kotlin/cc/polyfrost/oneconfig/utils/dsl/DSLs.kt b/src/main/kotlin/cc/polyfrost/oneconfig/utils/dsl/DSLs.kt index a71e3f1..cd0596e 100644 --- a/src/main/kotlin/cc/polyfrost/oneconfig/utils/dsl/DSLs.kt +++ b/src/main/kotlin/cc/polyfrost/oneconfig/utils/dsl/DSLs.kt @@ -1,9 +1,9 @@ package cc.polyfrost.oneconfig.utils.dsl -import cc.polyfrost.oneconfig.libs.universal.UMinecraft +import gg.essential.universal.UMinecraft /** * Gets the current [net.minecraft.client.Minecraft] instance. */ val mc -get() = UMinecraft.getMinecraft()
\ No newline at end of file + get() = UMinecraft.getMinecraft()
\ No newline at end of file diff --git a/src/main/kotlin/cc/polyfrost/oneconfig/utils/dsl/NetworkUtilsDSL.kt b/src/main/kotlin/cc/polyfrost/oneconfig/utils/dsl/NetworkUtilsDSL.kt index 3265993..7ce6c93 100644 --- a/src/main/kotlin/cc/polyfrost/oneconfig/utils/dsl/NetworkUtilsDSL.kt +++ b/src/main/kotlin/cc/polyfrost/oneconfig/utils/dsl/NetworkUtilsDSL.kt @@ -1,7 +1,7 @@ package cc.polyfrost.oneconfig.utils.dsl -import cc.polyfrost.oneconfig.libs.universal.UDesktop import cc.polyfrost.oneconfig.utils.NetworkUtils +import gg.essential.universal.UDesktop import java.io.File /** |