1.4 - 1.21 neoforge port

DakotaPride · Jan 28, 2025 · ec65fa5 · ec65fa5
1 parent db6039b
commit ec65fa5
Show file tree

Hide file tree

Showing 4,024 changed files with 48,643 additions and 32,954 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,15 +1,5 @@
-* text eol=lf
-*.bat text eol=crlf
-*.patch text eol=lf
-*.java text eol=lf
-*.gradle text eol=crlf
-*.png binary
-*.gif binary
-*.exe binary
-*.dll binary
-*.jar binary
-*.lzma binary
-*.zip binary
-*.pyd binary
-*.cfg text eol=lf
-*.jks binary
+# Disable autocrlf on generated files, they always generate with LF
+# Add any extra files or paths here to make git stop saying they
+# are changed when only line endings change.
+src/generated/**/.cache/cache text eol=lf
+src/generated/**/*.json text eol=lf
diff --git a/.gitignore b/.gitignore
@@ -11,8 +11,7 @@ out
 *.ipr
 *.iws
 *.iml
-.idea/*
-!.idea/scopes
+.idea
 
 # gradle
 build
@@ -21,3 +20,7 @@ build
 # other
 eclipse
 run
+runs
+run-data
+
+repo
diff --git a/CREDITS b/CREDITS
diff --git a/Common/build.gradle b/Common/build.gradle
diff --git a/Common/src/main/java/net/dakotapride/hibernalHerbs/common/Constants.java b/Common/src/main/java/net/dakotapride/hibernalHerbs/common/Constants.java
diff --git a/Common/src/main/java/net/dakotapride/hibernalHerbs/platform/Services.java b/Common/src/main/java/net/dakotapride/hibernalHerbs/platform/Services.java
diff --git a/Common/src/main/java/net/dakotapride/hibernalHerbs/platform/services/IPlatformHelper.java b/Common/src/main/java/net/dakotapride/hibernalHerbs/platform/services/IPlatformHelper.java
diff --git a/Common/src/main/resources/assets/hibernalherbs/blockstates/conjuration_altar.json b/Common/src/main/resources/assets/hibernalherbs/blockstates/conjuration_altar.json
diff --git a/Common/src/main/resources/assets/hibernalherbs/blockstates/envy_herb.json b/Common/src/main/resources/assets/hibernalherbs/blockstates/envy_herb.json
diff --git a/Common/src/main/resources/assets/hibernalherbs/blockstates/fennsel.json b/Common/src/main/resources/assets/hibernalherbs/blockstates/fennsel.json
diff --git a/Common/src/main/resources/assets/hibernalherbs/blockstates/fennsel_herb_barrel.json b/Common/src/main/resources/assets/hibernalherbs/blockstates/fennsel_herb_barrel.json
diff --git a/Common/src/main/resources/assets/hibernalherbs/blockstates/fennsel_herb_pile.json b/Common/src/main/resources/assets/hibernalherbs/blockstates/fennsel_herb_pile.json
diff --git a/Common/src/main/resources/assets/hibernalherbs/blockstates/fennsel_lantern.json b/Common/src/main/resources/assets/hibernalherbs/blockstates/fennsel_lantern.json
diff --git a/Common/src/main/resources/assets/hibernalherbs/blockstates/gluttony_herb.json b/Common/src/main/resources/assets/hibernalherbs/blockstates/gluttony_herb.json
diff --git a/Common/src/main/resources/assets/hibernalherbs/blockstates/greed_herb.json b/Common/src/main/resources/assets/hibernalherbs/blockstates/greed_herb.json
diff --git a/Common/src/main/resources/assets/hibernalherbs/blockstates/lust_herb.json b/Common/src/main/resources/assets/hibernalherbs/blockstates/lust_herb.json
diff --git a/Common/src/main/resources/assets/hibernalherbs/blockstates/myqueste_fence.json b/Common/src/main/resources/assets/hibernalherbs/blockstates/myqueste_fence.json
diff --git a/Common/src/main/resources/assets/hibernalherbs/blockstates/myqueste_fence_gate.json b/Common/src/main/resources/assets/hibernalherbs/blockstates/myqueste_fence_gate.json
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,8 +11,7 @@ out @@
     *.ipr
     *.iws
     *.iml
-    .idea/*
-    !.idea/scopes
+    .idea
     # gradle
     build
@@ Expand All / @@ -21,3 +20,7 @@ build @@
     # other
     eclipse
     run
+    runs
+    run-data
+    repo