testing pre-commit strats

.gitattributes

@@ -33,3 +33,49 @@
 *.mca filter=lfs diff=lfs merge=lfs -text
 *.dat filter=lfs diff=lfs merge=lfs -text
 *.dat_old filter=lfs diff=lfs merge=lfs -text
+
+# thanks Gregtech new horizons!
+* text eol=lf
+
+*.[jJ][aA][rR]          binary
+
+*.[pP][nN][gG]          binary
+*.[jJ][pP][gG]          binary
+*.[jJ][pP][eE][gG]      binary
+*.[gG][iI][fF]          binary
+*.[tT][iI][fF]          binary
+*.[tT][iI][fF][fF]      binary
+*.[iI][cC][oO]          binary
+*.[sS][vV][gG]          text
+*.[eE][pP][sS]          binary
+*.[xX][cC][fF]          binary
+
+*.[kK][aA][rR]          binary
+*.[mM]4[aA]             binary
+*.[mM][iI][dD]          binary
+*.[mM][iI][dD][iI]      binary
+*.[mM][pP]3             binary
+*.[oO][gG][gG]          binary
+*.[rR][aA]              binary
+
+*.7[zZ]                 binary
+*.[gG][zZ]              binary
+*.[tT][aA][rR]          binary
+*.[tT][gG][zZ]          binary
+*.[zZ][iI][pP]          binary
+
+*.[tT][cC][nN]          binary
+*.[sS][oO]              binary
+*.[dD][lL][lL]          binary
+*.[dD][yY][lL][iI][bB]  binary
+*.[pP][sS][dD]          binary
+*.[tT][tT][fF]          binary
+*.[oO][tT][fF]          binary
+
+*.[pP][aA][tT][cC][hH]  -text
+
+*.[bB][aA][tT]          text eol=crlf
+*.[cC][mM][dD]          text eol=crlf
+*.[pP][sS]1             text eol=crlf
+
+*[aA][uU][tT][oO][gG][eE][nN][eE][rR][aA][tT][eE][dD]* binary

1.20.1-FearFactoryTest/instance.cfg

@@ -67,7 +67,7 @@ UseNativeOpenAL=false
 UseZink=false
 WrapperCommand=
 iconKey=default
-lastLaunchTime=1746996608203
+lastLaunchTime=1746997277419
 lastTimePlayed=635
 linkedInstances=[]
 name=1.20.1 FearFactory

1.20.1-FearFactoryTest/minecraft/config/allthetrims.json

@@ -1,4 +1,4 @@
 {
   "debug": false,
-  "trim_registry_mismatch_message": "<EFBFBD>b[All The Trims] <EFBFBD>cTrim Registry Mismatch. <EFBFBD>rPlease ensure that the client and server have the same mods with the same versions."
+  "trim_registry_mismatch_message": "§b[All The Trims] §cTrim Registry Mismatch. §rPlease ensure that the client and server have the same mods with the same versions."
 }

1.20.1-FearFactoryTest/minecraft/config/embeddium-fingerprint.json

@@ -1 +1 @@
-{"v":1,"s":"447cce900861185a26f75c8e5cff37844039b831cb80831694a4ac66a9a32c0934662c97fe2df17b173e53afd66811904047d92a4f50c483e3fe403c083aab90","u":"f720aefdb476bd745ad9fa1daa7721f1e48c405188ef43d0b6c1b478e6c83bacf54e403e347c0034a4ce265411c7a53f78b9806a20373eb37850ab4be48116b4","p":"f98c4121dfe5d1e018b3d60058abbed53c9ab7acd6dda4b7d5aa72778234cdec1ec0b38535c58457e72e1f5ecc21911af43b70984a02b42df3932feca4964003","t":1746969583}
+{"v":1,"s":"76c677720f7f959b6ade8c9f002b76295a3a83e322d811b3eb73092e6328eb0b1e65a60d8c1e3ce5e8d6500299d0356cc14572ebe5cd8b34e4c038c1d34b8535","u":"905202c79ca62aaec10775870bd8925b6923648f5e8efe98ec91fa37588474aa3b5cab4bc508436836e5cffb1f91a8ed68934c558ad6c0e5d4b16235e27950b7","p":"05782e439e4a6dc3b6f727be2e373043e1812fef35664c9b2e81dd02e897a899456f81d8c943d6ede97209b448d677fdc5c50571e10efbadcef03e13b191dde6","t":1746997297}

1.20.1-FearFactoryTest/minecraft/config/fabric/indigo-renderer.properties

@@ -1,5 +1,5 @@
 #Indigo properties file
-#Sun May 11 11:40:21 CDT 2025
+#Sun May 11 16:01:38 CDT 2025
 fix-mean-light-calculation=auto
 debug-compare-lighting=auto
 fix-exterior-vertex-lighting=auto

1.20.1-FearFactoryTest/minecraft/config/terrablender.toml

@@ -3,15 +3,15 @@ general = {}
 
 #Generation settings
 [generation_settings]
-	#The size of nether biome regions from each mod that uses TerraBlender.
-	#Range: 2-6
-	nether_region_size = 2
 	#The size of overworld biome regions from each mod that uses TerraBlender.
 	#Range: 2-6
 	overworld_region_size = 3
 	#The weighting of vanilla biome regions in the nether.
 	#Range: 0-2147483647
 	vanilla_nether_region_weight = 10
+	#The size of nether biome regions from each mod that uses TerraBlender.
+	#Range: 2-6
+	nether_region_size = 2
 	#The weighting of vanilla biome regions in the overworld.
 	#Range: 0-2147483647
 	vanilla_overworld_region_weight = 10

1.20.1-FearFactoryTest/minecraft/config/tradersindisguise-common-5.toml.bak

@@ -0,0 +1,33 @@
+
+["Config for Traders in Disguise"]
+	#Chance wandering trader is actually Ambusher. Will be a 1 in (your number) chance. Default value is 20, meaning a 1 in 20 (or 5%) chance.
+	"Ambusher Chance Bound" = 20
+	#Whether or not Sickle Ambushers can spawn from wandering traders. Default: true
+	"Spawn Sickle Ambushers" = true
+	#Whether or not Bow Ambushers can spawn from wandering traders. Default: true
+	"Spawn Bow Ambushers" = true
+	#The maximum amount of damage any Ambusher can take in one hit. Does not apply to the void or /kill. Default: 10
+	"Ambusher Damage Cap" = 10
+	#Whether or not Ambushers can spawn in raids. If true, Ambushers will appear in raid waves based on the next 2 config options. Default: false
+	"Spawn Ambushers in Raids" = false
+	#How many Sickle Ambushers in each raid wave. Must have no more and no less than 8 integers. Default: 0, 0, 0, 0, 0, 1, 0, 1
+	"Sickle Ambusher Wave Count" = [0, 0, 0, 0, 0, 1, 0, 1]
+	#How many Bow Ambushers in each raid wave. Must have no more and no less than 8 integers. Default: 0, 0, 0, 0, 1, 0, 0, 1
+	"Bow Ambusher Wave Count" = [0, 0, 0, 0, 1, 0, 0, 1]
+	#Level of the swiftness effect given by the Ruthless Sickle. Counts from 0, so 0 is level 1, 1 is level 2, etc. Also affects Sickle Ambusher. Default: 1
+	"Sickle Swiftness Level" = 1
+	#Duration of the swiftness effect given by the Ruthless Sickle measured in ticks. Also affects Sickle Ambusher. Default: 20
+	"Sickle Swiftness Duration" = 20
+	#Duration of the blindness effect given by the Ruthless Sickle measured in ticks. Also affects Sickle Ambusher. Default: 60
+	"Sickle Blindness Duration" = 60
+	#The damage multiplier of the Ruthless Sickle when striking a mob that's under half health. Also affects Sickle Ambusher. Default: 3.0
+	"Sickle Damage Multiplier" = 3.0
+	#Level of the slowness effect given by the Trifectal Bow. Counts from 0, so 0 is level 1, 1 is level 2, etc. Also affects Bow Ambusher. Default: 6
+	"Bow Slowness Level" = 6
+	#Level of the weakness effect given by the Trifectal Bow. Counts from 0, so 0 is level 1, 1 is level 2, etc. Also affects Bow Ambusher Default: 6
+	"Bow Weakness Level" = 6
+	#Duration of the slowness effect given by the Trifectal Bow measured in ticks. Also affects Bow Ambusher. Default: 20
+	"Bow Slowness Duration" = 20
+	#Duration of the weakness effect given by the Trifectal Bow measured in ticks. Also affects Bow Ambusher. Default: 20
+	"Bow Weakness Duration" = 20
+