Compare commits

..

2 Commits

Author SHA1 Message Date
c7f8e3ed77 ".disabled" files are now respected by gitlfs
Additionaly used git rm --cache filename and some amend trickery to reduce file noise instance.cfg for instance show no longer show up in changes but still get cloned from repo.  (this can be overriden with git add -f filename)
2025-05-12 22:13:26 -05:00
2776b31851 ".disabled" files are now respected by gitlfs
Additionaly used git rm --cache filename and some amend trickery to reduce file noise instance.cfg for instance show no longer show up in changes but still get cloned from repo.  (this can be overriden with git add -f filename)
2025-05-12 22:12:31 -05:00
12 changed files with 63 additions and 55 deletions

9
.gitattributes vendored
View File

@ -34,9 +34,12 @@
*.dat filter=lfs diff=lfs merge=lfs -text
*.dat_old filter=lfs diff=lfs merge=lfs -text
*.disabled 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
@ -47,6 +50,7 @@
*.[sS][vV][gG] text
*.[eE][pP][sS] binary
*.[xX][cC][fF] binary
*.[kK][aA][rR] binary
*.[mM]4[aA] binary
*.[mM][iI][dD] binary
@ -54,11 +58,13 @@
*.[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
@ -66,8 +72,11 @@
*.[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

10
.gitignore vendored
View File

@ -24,12 +24,6 @@
1.20.1-FearFactoryTest/minecraft/mods/enhanced_boss_bars-1.20.1-1.0.0.jar
1.20.1-FearFactoryTest/minecraft/mods/RenderScale-forge-1.20.1-1.0.jar
1.20.1-FearFactoryTest/minecraft/mods/ToadLib-1.3.1-1.20-1.20.1.jar
1.20.1-FearFactoryTest/minecraft/mods/.index/tears-of-despair_nightmare_fuel.pw.toml
/1.20.1-FearFactoryTest/minecraft/mods/.index
1.20.1-FearFactoryTest/minecraft/config/embeddium-fingerprint.json
1.20.1-FearFactoryTest/minecraft/config/fabric/indigo-renderer.properties
1.20.1-FearFactoryTest/minecraft/config/flywheel-client-1.toml.bak
1.20.1-FearFactoryTest/minecraft/config/flywheel-client-1
1.20.1-FearFactoryTest/minecraft/config/flywheel-client.toml
1.20.1-FearFactoryTest/minecraft/config/allthetrims.json
1.20.1-FearFactoryTest/minecraft/config/oculus.properties
1.20.1-FearFactoryTest/minecraft/icon.png
1.20.1-FearFactoryTest/minecraft/config/fabric/indigo-renderer.properties

View File

@ -1,32 +1,20 @@
[General]
AutoCloseConsole=false
AutomaticJava=true
CloseAfterLaunch=false
ConfigVersion=1.2
CustomGLFWPath=
CustomOpenALPath=
EnableFeralGamemode=false
EnableMangoHud=false
Env=@Variant(\0\0\0\b\0\0\0\0)
ExportAuthor=
ExportName=
ExportOptionalFiles=true
ExportSummary=
ExportVersion=1.0.0
IgnoreJavaCompatibility=false
InstanceAccountId=
InstanceType=OneSix
JavaArchitecture=64
JavaPath=/home/qb/.var/app/org.prismlauncher.PrismLauncher/data/PrismLauncher/java/java-runtime-gamma/bin/java
JavaPath=C:/Users/Keybl/Documents/PrismLauncher-Windows-MinGW-w64-Portable-9.4/java/java-runtime-gamma/bin/javaw.exe
JavaRealArchitecture=amd64
JavaSignature=7b784ed89ddd21859884bcf0fad44d920fc92286
JavaSignature=2c94189bf2f770bbfd88f8047fdcb69e492a67b6
JavaVendor=Microsoft
JavaVersion=17.0.8
JoinServerOnLaunch=false
JoinServerOnLaunchAddress=
JoinWorldOnLaunch=
JvmArgs=
LaunchMaximized=false
LogPrePostOutput=true
ManagedPack=false
ManagedPackID=
@ -36,9 +24,6 @@ ManagedPackVersionID=
ManagedPackVersionName=
MaxMemAlloc=16384
MinMemAlloc=512
MinecraftWinHeight=480
MinecraftWinWidth=854
OnlineFixes=false
OverrideCommands=false
OverrideConsole=false
OverrideEnv=false
@ -52,29 +37,44 @@ OverrideNativeWorkarounds=false
OverridePerformance=false
OverrideWindow=false
PermGen=128
Profiler=
UseAccountForInstance=false
iconKey=default
lastLaunchTime=1747044152890
lastTimePlayed=5516
linkedInstances=[]
name=1.20.1 FearFactory
notes=
totalTimePlayed=44988
AutoCloseConsole=false
CloseAfterLaunch=false
CustomGLFWPath=
CustomOpenALPath=
EnableFeralGamemode=false
EnableMangoHud=false
Env=@Variant(\0\0\0\b\0\0\0\0)
InstanceAccountId=
JoinServerOnLaunchAddress=
JoinWorldOnLaunch=
JvmArgs=
LaunchMaximized=false
MinecraftWinHeight=480
MinecraftWinWidth=854
OnlineFixes=false
PostExitCommand=
PreLaunchCommand=
Profiler=
QuitAfterGameStop=false
RecordGameTime=true
ShowConsole=false
ShowConsoleOnError=true
ShowGameTime=true
UseAccountForInstance=false
UseDiscreteGpu=false
UseNativeGLFW=false
UseNativeOpenAL=false
UseZink=false
WrapperCommand=
iconKey=default
lastLaunchTime=1747104750493
lastTimePlayed=123
linkedInstances=[]
name=1.20.1 FearFactory
notes=
totalTimePlayed=45111
[UI]
mods_Page\Columns=@ByteArray(\0\0\0\xff\0\0\0\0\0\0\0\x1\0\0\0\x1\0\0\0\x1\x1\0\0\0\0\0\0\0\0\0\0\0\v\x80\a\0\0\0\x4\0\0\0\a\0\0\0\x64\0\0\0\t\0\0\0\x64\0\0\0\b\0\0\0\x64\0\0\0\n\0\0\0\x64\0\0\x3\x39\0\0\0\v\x1\x1\0\0\0\0\0\0\x1\0\0\0\0\0\0\0\x64\xff\xff\xff\xff\0\0\0\x81\0\0\0\0\0\0\0\v\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\0\xe1\0\0\0\x1\0\0\0\x1\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\x1\0\0\0\0\0\0\x3\xe8\0\0\0\0\x64\0\0\0\0)
mods_Page\Columns=@ByteArray(\0\0\0\xff\0\0\0\0\0\0\0\x1\0\0\0\x1\0\0\0\x1\x1\0\0\0\0\0\0\0\0\0\0\0\v\x80\a\0\0\0\x4\0\0\0\a\0\0\0\x64\0\0\0\b\0\0\0\x64\0\0\0\n\0\0\0\x64\0\0\0\t\0\0\0\x64\0\0\x3\x39\0\0\0\v\x1\x1\0\0\0\0\0\0\x1\0\0\0\0\0\0\0\x64\xff\xff\xff\xff\0\0\0\x81\0\0\0\0\0\0\0\v\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\0\xe1\0\0\0\x1\0\0\0\x1\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\x1\0\0\0\0\0\0\x3\xe8\0\0\0\0\x64\0\0\0\0)
resourcepacks_Page\Columns=@ByteArray(\0\0\0\xff\0\0\0\0\0\0\0\x1\0\0\0\0\0\0\0\x1\x1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x2X\0\0\0\x6\x1\x1\0\0\0\0\0\0\x1\0\0\0\0\0\0\0\x64\xff\xff\xff\xff\0\0\0\x81\0\0\0\0\0\0\0\x6\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\x1\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\x3\xe8\0\0\0\0\x64\0\0\0\0)
shaderpacks_Page\Columns=@ByteArray(\0\0\0\xff\0\0\0\0\0\0\0\x1\0\0\0\0\0\0\0\x1\x1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x1\x90\0\0\0\x4\x1\x1\0\0\0\0\0\0\x1\0\0\0\0\0\0\0\x64\xff\xff\xff\xff\0\0\0\x81\0\0\0\0\0\0\0\x4\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\x1\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\x3\xe8\0\0\0\0\x64\0\0\0\0)

View File

@ -1,4 +1,4 @@
{
"debug": false,
"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."
"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."
}

View File

@ -8,7 +8,7 @@
enableCuttingBoardDeploying = true
#.
#List of Block Entities that can be boosted when placed on Blaze Stove
boostingCookerList = ["farmersdelight:cooking_pot", "farmersdelight:skillet", "miners_delight:copper_pot"]
boostingCookerList = ["farmersdelight:cooking_pot", "farmersdelight:skillet"]
#.
#Config for Integration with other mods

View File

@ -1 +1 @@
{"v":1,"s":"e55d22b95ffc337043c53aaacd2afbb598a8ec056c9603fd4d6dd9cf0b3c0c155765e4b0a4e1b670a19f4be08967a18e40807bac21f02be0e36b413b48c0f994","u":"5d355d6f4655d6cfb39de5fa395b4c40f735eeb6cc140f108be42d1474c294137d407a6af4f77671e19a4debbac659d55f06549bbba369d1d997e01797fbe277","p":"4609c01c390769b047a61ee093c28916ec02a40a19d8a224c5f666a3703adb9eb6fb23178aaf0a668dd3061cd245e8e701e8f2aac115edf7e7b9172e42678c5c","t":1747104776}
{"v":1,"s":"4ad5a6343f108c5f62e8926945582e75b23a3cc71bfe6682509b9d653f37831bd08ff4711e0022c61fd5a9a41375a2e2981e8bce658fb7e82595f1c2bfef50e6","u":"7004904bd974233150270e07603076ce06abd0f303b79087eb2dea802a977082a9f6606ce49f4855a8ca1b29a6eea7e7b16f179b70eb9390eea28aa6b1fad3d4","p":"804a9be946ff25856bd4fc179420becef0cf4729ac81ec6160da3402cdbb20bb53b8eee67168ac6ced31a7ab8047ce2253b9f012e79c029675a40aba73f0333a","t":1747028273}

View File

@ -1,14 +0,0 @@
#Select the backend to use. Set to "DEFAULT" to let Flywheel decide.
backend = "DEFAULT"
#Enable or disable instance update limiting with distance.
limitUpdates = true
#The number of worker threads to use. Set to -1 to let Flywheel decide. Set to 0 to disable parallelism. Requires a game restart to take effect.
#Range: -1 ~ 16
workerThreads = -1
#Config options for Flywheel's built-in backends.
[flw_backends]
#How smooth Flywheel's shader-based lighting should be. May have a large performance impact.
#Allowed Values: FLAT, TRI_LINEAR, SMOOTH, SMOOTH_INNER_FACE_CORRECTED
lightSmoothness = "SMOOTH"

View File

@ -1,5 +1,5 @@
#This file stores configuration options for Iris, such as the currently active shaderpack
#Mon May 12 21:52:56 CDT 2025
#Mon May 12 03:56:09 CDT 2025
colorSpace=SRGB
disableUpdateMessage=false
enableDebugOptions=false

BIN
1.20.1-FearFactoryTest/minecraft/icon.png (Stored with Git LFS)

Binary file not shown.

View File

@ -0,0 +1,16 @@
filename = 'tears_of_despair-2.0-forge-1.20.1.jar'
name = 'Tears of Despiar Nightmare Fuel'
side = 'both'
x-prismlauncher-loaders = [ 'forge' ]
x-prismlauncher-mc-versions = [ '1.20.1' ]
x-prismlauncher-release-type = 'beta'
[download]
hash = 'f254d65437997603848b188096066a80ce414e6fe67772eda21d0aaeff2ff5910d0e0e1249d18487e76dc832877a92bc87adb86c14d168fda5ef32b8023b5997'
hash-format = 'sha512'
mode = 'url'
url = 'https://cdn.modrinth.com/data/khZrj89W/versions/NVTg2utV/tears_of_despair-2.0-forge-1.20.1.jar'
[update.modrinth]
mod-id = 'khZrj89W'
version = 'NVTg2utV'

Binary file not shown.

View File

@ -1,4 +1,4 @@
#Mon May 12 21:52:55 CDT 2025
#Mon May 12 04:10:57 CDT 2025
shadowDistance=160.0
SUN_ANGULAR_RADIUS=10.0
STARS_INTENSITY=0.90