Skip to content

Commit

Permalink
Ran assets through oxipng
Browse files Browse the repository at this point in the history
  • Loading branch information
TheLMiffy1111 committed Feb 26, 2025
1 parent 39fd636 commit f876d85
Show file tree
Hide file tree
Showing 1,088 changed files with 48 additions and 26 deletions.
26 changes: 16 additions & 10 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,27 @@
* text=auto

# Custom for Visual Studio
*.cs diff=csharp
*.sln merge=union
*.cs diff=csharp
*.sln merge=union
*.csproj merge=union
*.vbproj merge=union
*.fsproj merge=union
*.dbproj merge=union

# Standard to msysgit
*.doc diff=astextplain
*.DOC diff=astextplain
*.doc diff=astextplain
*.DOC diff=astextplain
*.docx diff=astextplain
*.DOCX diff=astextplain
*.dot diff=astextplain
*.DOT diff=astextplain
*.pdf diff=astextplain
*.PDF diff=astextplain
*.rtf diff=astextplain
*.RTF diff=astextplain
*.dot diff=astextplain
*.DOT diff=astextplain
*.pdf diff=astextplain
*.PDF diff=astextplain
*.rtf diff=astextplain
*.RTF diff=astextplain

# Linux start script should use lf
/gradlew text eol=lf

# Windows script files should use crlf
*.bat text eol=crlf
15 changes: 13 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,21 @@ out
*.iml
.idea

# vscode
.vscode

# gradle
build
.gradle

# other
eclipse
# macos
*.DS_Store

# java
hs_err_*.log
replay_*.log
*.hprof
*.jfr

# minecraft
run
22 changes: 11 additions & 11 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
plugins {
id "com.crystaelix.loom" version "jitpack-a771545d"
id "com.crystaelix.loom" version "jitpack-ca3766c3"
id "eclipse"
id "idea"
id "maven-publish"
id "net.kyori.blossom" version "[1,2)"
id "me.modmuss50.mod-publish-plugin" version "0.5.0"
id "me.modmuss50.mod-publish-plugin" version "0.7.4"
}

repositories {
Expand Down Expand Up @@ -128,7 +128,7 @@ loom {

dependencies {
// Log4j
implementation "org.apache.logging.log4j:log4j-core:2.22.1"
implementation "org.apache.logging.log4j:log4j-core:2.24.1"

// Minecraft
minecraft "com.mojang:minecraft:1.12.2"
Expand All @@ -139,13 +139,13 @@ dependencies {
modImplementation "curse.maven:dummycore-unofficial-266491:2611426"
modImplementation "curse.maven:baubles-227083:2518667"
modImplementation "codechicken:CodeChickenLib:1.12.2-3.2.3.358:universal"
modImplementation "mezz.jei:jei_1.12.2:4.16.1.1012"
modImplementation "team.chisel.ctm:CTM:MC1.12.2-1.0.2.31"
modImplementation "mezz.jei:jei_1.12.2:4.16.1.1013"
modImplementation "team.chisel.ctm:CTM:MC1.12.2-1.0.2.31"
modImplementation "curse.maven:hwyla-253449:2568751"

modImplementation("CraftTweaker2:ZenScript:4.1.20.700") {transitive = false}
modImplementation("CraftTweaker2:CraftTweaker2-API:4.1.20.700") {transitive = false}
modImplementation("CraftTweaker2:CraftTweaker2-MC1120-Main:1.12-4.1.20.700") {transitive = false}
modImplementation("CraftTweaker2:ZenScript:4.1.20.703") {transitive = false}
modImplementation("CraftTweaker2:CraftTweaker2-API:4.1.20.703") {transitive = false}
modImplementation("CraftTweaker2:CraftTweaker2-MC1120-Main:1.12-4.1.20.703") {transitive = false}

modImplementation "slimeknights.mantle:Mantle:1.12-1.3.3.55"
modImplementation "slimeknights:TConstruct:1.12.2-2.13.0.183"
Expand All @@ -161,10 +161,10 @@ dependencies {
modImplementation "curse.maven:mekanism-268560:2835175"

// Performance
implementation("zone.rong:mixinbooter:9.2") {transitive = false}
implementation("zone.rong:mixinbooter:10.5") {transitive = false}
modImplementation "curse.maven:reid-629017:5502915"
modImplementation "curse.maven:vintagefix-871198:5536276"
modImplementation "curse.maven:lolasm-460609:5257348"
modImplementation "curse.maven:vintagefix-871198:6217171"
modImplementation "curse.maven:lolasm-460609:6217170"
}

def replacements = [
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
7 changes: 5 additions & 2 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#

##############################################################################
#
Expand Down Expand Up @@ -55,7 +57,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
Expand Down Expand Up @@ -84,7 +86,8 @@ done
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
' "$PWD" ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down
2 changes: 2 additions & 0 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@rem SPDX-License-Identifier: Apache-2.0
@rem

@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit f876d85

Please sign in to comment.