Skip to content

Commit

Permalink
Sync overrides
Browse files Browse the repository at this point in the history
  • Loading branch information
juraj-hrivnak committed Dec 9, 2022
1 parent 4a98b44 commit fdbc694
Show file tree
Hide file tree
Showing 23 changed files with 407 additions and 65 deletions.
6 changes: 3 additions & 3 deletions config/Special_AI.cfg

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion config/craftpresence.json
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,8 @@
},
"dynamicIcons": {
"default": "https://via.placeholder.com/256.png",
"KokinoRe5pect": "https://crafatar.com/avatars/abfee173bfae4a95bf63b4bfd5f62594"
"KokinoRe5pect": "https://crafatar.com/avatars/abfee173bfae4a95bf63b4bfd5f62594",
"karl226": "https://crafatar.com/avatars/2f690abb4336488b8d93db6f4e5896d0"
}
}
}
Binary file modified config/customloadingscreen_timings.nbt
Binary file not shown.
123 changes: 98 additions & 25 deletions config/fancymenu/locals/en_us.local

Large diffs are not rendered by default.

39 changes: 39 additions & 0 deletions config/jeiutilities/jeiutilities.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# Configuration file

bookmark {
# Current mode of recording recipes
S:recordMode=ENABLE

# Record current recipe when add ingredient to bookmark in recipe screen [default: true]
B:recordRecipes=true

# Display a letter "R" in the upper left corner of the recipe bookmark. [default: true]
B:showRecipeBookmarkReminders=true
}


history {
# Color of the history area display [range: -2147483648 ~ 2147483647, default: -296397483]
I:backgroundColour=-296397483

# Enable browsing history function [default: true]
B:enableHistory=true

# Add item with different nbt to the browsing history [default: true]
B:matchesNBTs=true

# Splitting mode for the browsing history.
# Mode : BACKGROUND, DOTTED_LINE [default: DOTTED_LINE]
S:splittingMode=DOTTED_LINE
}


render {
# If true, then the recipe preview will automatically select the appropriate scaling based on the screen size. [default: true]
B:adaptiveRecipePreview=true

# The scaling of the recipe preview.It is only used when adaptiveRecipePreview is false. [range: 0.01 ~ 5.0, default: 0.8]
S:recipePreviewScaling=0.8
}


47 changes: 47 additions & 0 deletions config/neenergistics/neenergistics.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
# Configuration file

helper {
# Highlight colour of craftable ingredients in Recipe Gui.
# Format: 0xRRGGBBAA [default: 0x660000FF]
S:CraftableHighlightColor=0x660000FF

# Highlight colour of missing ingredients in Recipe Gui.
# Format: 0xRRGGBBAA [default: 0x66FF0000]
S:MissingHighlightColour=0x66FF0000

# Time interval in milliseconds for updating recipe information in Recipe Gui.
# Never updated when set to -1. [range: -1 ~ 60000, default: 1500]
I:UpdateIntervalTime=1500
}


other {
# If true, it will make all similar ingredient switch at the same time. [default: true]
B:SyncIngredientSwitcher=true
}


transfer {
# If a recipe type is in here, it will not be merged. [default: ]
S:MergeBlackList <
>

# Ingredient Merge Mode Setting, here are all the modes.
# "ENABLED" "DISABLED" WHITELIST [default: ENABLED]
S:MergeMode=ENABLED

# If true, the ingredient will be transferred from network first, then from inventory,and finally from jei.[Default:true] [default: true]
B:NetworkOrInventoryFirst=true

# If true, print current recipe type in log.[Default:false] [default: false]
B:PrintRecipeType=false

# If oredict has this mod's item, use it first. [default: ]
S:PriorityMods <
>

# If true, the ingredient currently displayed by JEI will be transferred.[Default:false] [default: false]
B:UseDisplayed=false
}


Binary file modified config/tinker_ore_dict_melting_cache.dat
Binary file not shown.
3 changes: 3 additions & 0 deletions config/tool_progression/blocks.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -59790,6 +59790,9 @@ block {
# modularui:test_block:0 [default: pickaxe=0]
S:"modularui:test_block:0"=pickaxe=0

# neenergistics:pattern_interface:0 [default: pickaxe=0]
S:"neenergistics:pattern_interface:0"=pickaxe=0

# openblocks:auto_anvil:0 [default: pickaxe=0]
S:"openblocks:auto_anvil:0"=pickaxe=0

Expand Down
6 changes: 3 additions & 3 deletions pax/modpack/overrides/config/Special_AI.cfg

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion pax/modpack/overrides/config/craftpresence.json
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,8 @@
},
"dynamicIcons": {
"default": "https://via.placeholder.com/256.png",
"KokinoRe5pect": "https://crafatar.com/avatars/abfee173bfae4a95bf63b4bfd5f62594"
"KokinoRe5pect": "https://crafatar.com/avatars/abfee173bfae4a95bf63b4bfd5f62594",
"karl226": "https://crafatar.com/avatars/2f690abb4336488b8d93db6f4e5896d0"
}
}
}
Binary file modified pax/modpack/overrides/config/customloadingscreen_timings.nbt
Binary file not shown.
3 changes: 2 additions & 1 deletion pax/modpack/overrides/config/fancymenu/config.txt
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ S:customgameintroskiptext = '';
##[minecraftwindow]

[A minecraft restart is required after changing this value.]
S:customwindowtitle = 'Underdog 3.1.0';
S:customwindowtitle = 'Underdog 3.1.1';
[A minecraft restart is required after changing this value.]
B:customwindowicon = 'false';

Expand All @@ -66,6 +66,7 @@ B:showvanillamovewarning = 'true';

##[ui]

B:show_unicode_warning = 'true';
F:uiscale = '1.5';


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ customization {
width = 228
action = deep_customization_element:title_screen_forge_copyright
actionid = 3d406119-8896-4aba-b83e-e2a32116063a1659215009194
y = 340
y = 319
height = 9
}

Expand Down Expand Up @@ -279,6 +279,6 @@ customization {
y = -48
scale = 1.0
alignment = left
value = v3.1.0
value = v3.1.1
}

123 changes: 98 additions & 25 deletions pax/modpack/overrides/config/fancymenu/locals/en_us.local

Large diffs are not rendered by default.

5 changes: 4 additions & 1 deletion pax/modpack/overrides/config/incontrol/spawn.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,15 @@
"minheight": 55,
"maxheight": 100,
"healthmultiply": 2,
"speedmultiply": 2,
"speedmultiply": 1.2,
"angry": true,
"seesky": false,
"maxlight": 8,
"mintime": 13500,
"maxtime": 21999,
"nbt": {
"Age": 600
},
"maxcount": {
"amount": 10,
"perplayer": false
Expand Down
39 changes: 39 additions & 0 deletions pax/modpack/overrides/config/jeiutilities/jeiutilities.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# Configuration file

bookmark {
# Current mode of recording recipes
S:recordMode=ENABLE

# Record current recipe when add ingredient to bookmark in recipe screen [default: true]
B:recordRecipes=true

# Display a letter "R" in the upper left corner of the recipe bookmark. [default: true]
B:showRecipeBookmarkReminders=true
}


history {
# Color of the history area display [range: -2147483648 ~ 2147483647, default: -296397483]
I:backgroundColour=-296397483

# Enable browsing history function [default: true]
B:enableHistory=true

# Add item with different nbt to the browsing history [default: true]
B:matchesNBTs=true

# Splitting mode for the browsing history.
# Mode : BACKGROUND, DOTTED_LINE [default: DOTTED_LINE]
S:splittingMode=DOTTED_LINE
}


render {
# If true, then the recipe preview will automatically select the appropriate scaling based on the screen size. [default: true]
B:adaptiveRecipePreview=true

# The scaling of the recipe preview.It is only used when adaptiveRecipePreview is false. [range: 0.01 ~ 5.0, default: 0.8]
S:recipePreviewScaling=0.8
}


47 changes: 47 additions & 0 deletions pax/modpack/overrides/config/neenergistics/neenergistics.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
# Configuration file

helper {
# Highlight colour of craftable ingredients in Recipe Gui.
# Format: 0xRRGGBBAA [default: 0x660000FF]
S:CraftableHighlightColor=0x660000FF

# Highlight colour of missing ingredients in Recipe Gui.
# Format: 0xRRGGBBAA [default: 0x66FF0000]
S:MissingHighlightColour=0x66FF0000

# Time interval in milliseconds for updating recipe information in Recipe Gui.
# Never updated when set to -1. [range: -1 ~ 60000, default: 1500]
I:UpdateIntervalTime=1500
}


other {
# If true, it will make all similar ingredient switch at the same time. [default: true]
B:SyncIngredientSwitcher=true
}


transfer {
# If a recipe type is in here, it will not be merged. [default: ]
S:MergeBlackList <
>

# Ingredient Merge Mode Setting, here are all the modes.
# "ENABLED" "DISABLED" WHITELIST [default: ENABLED]
S:MergeMode=ENABLED

# If true, the ingredient will be transferred from network first, then from inventory,and finally from jei.[Default:true] [default: true]
B:NetworkOrInventoryFirst=true

# If true, print current recipe type in log.[Default:false] [default: false]
B:PrintRecipeType=false

# If oredict has this mod's item, use it first. [default: ]
S:PriorityMods <
>

# If true, the ingredient currently displayed by JEI will be transferred.[Default:false] [default: false]
B:UseDisplayed=false
}


2 changes: 1 addition & 1 deletion pax/modpack/overrides/config/splash.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#Splash screen properties
#Sat Dec 03 21:40:32 CET 2022
#Fri Dec 09 19:23:50 CET 2022
logoOffset=0
barBackground=0xFFFFFF
memoryGood=0x78CB34
Expand Down
Binary file modified pax/modpack/overrides/config/tinker_ore_dict_melting_cache.dat
Binary file not shown.
3 changes: 3 additions & 0 deletions pax/modpack/overrides/config/tool_progression/blocks.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -59790,6 +59790,9 @@ block {
# modularui:test_block:0 [default: pickaxe=0]
S:"modularui:test_block:0"=pickaxe=0

# neenergistics:pattern_interface:0 [default: pickaxe=0]
S:"neenergistics:pattern_interface:0"=pickaxe=0

# openblocks:auto_anvil:0 [default: pickaxe=0]
S:"openblocks:auto_anvil:0"=pickaxe=0

Expand Down
2 changes: 1 addition & 1 deletion pax/modpack/overrides/local/client/rtdata.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"timeOfDayOverlay":{"New World----------------":false,"New World---------------":false,"New World--------------":false,"Rockharaght":false,"New World-------------":false,"-test":false,"New World--":false,"savedongo":false,"51.89.8.171:25565":false,"kokos-":false,"New World-----------------":false,"New World------------------":false,"Testtttt":false,"NewJoe":false,"New World-------------------":false,"Copy of New World-":false,"Water-Test":false,"Water-Rest":false,"New World--------------------":false,"LetsGoooou":false,"Mangroove":false,"New World---------------------":false,"New World----------------------":false,"Copy of New World--":false,"New World-----------------------":false,"New World------------------------":false,"New World-------------------------":false,"New World--------------------------":false,"New World---------------------------":false,"New World----------------------------":false,"New World-----------------------------":false,"New World------------------------------":false,"Zarastene":false,"New World-------------------------------":false,"Wasteland":false,"New World--------------------------------":false,"New World---------------------------------":false,"New World----------------------------------":false,"Copy of New World---":false,"New World-----------------------------------":false,"New World------------------------------------":false,"Testujem":false,"New World-------------------------------------":false,"New World--------------------------------------":false,"Skuska1000":false,"New World---------------------------------------":false,"Mesa":false,"New World----------------------------------------":false,"New World-----------------------------------------":false,"New World------------------------------------------":false,"New World-------------------------------------------":false,"Savana Bitch":false,"lopotok":false,"New World--------------------------------------------":false,"New World---------------------------------------------":false,"New World----------------------------------------------":false,"Copy of Mesa":false,"Geography":false,"GeoCraft":false,"New World-----------------------------------------------":false,"Teeest":false,"New World":false,"New World-":false,"New World------":false,"New World-------":false,"New World------------------------------------------------":false,"New World-------------------------------------------------":false,"New World--------------------------------------------------":false,"New World---------------------------------------------------":false,"New World----------------------------------------------------":false,"New World-----------------------------------------------------":false,"New World------------------------------------------------------":false,"Chtest":false,"New World-------------------------------------------------------":false,"Idkokos":false,"Saktest":false,"New Worldf":false,"New World--------------------------------------------------------":false,"New teskto":false,"New World---------------------------------------------------------":false,"Copy of Rockharaght":false,"Randomero":false,"efegfefefe":false,"Test Layers":false,"underdog.modded.fun":false,"teeeeeeeeskokos":false,"Test craters":false,"GRASS":false,"Quests Making 2":false,"Quests Making":false,"Quest Making 3":false,"Poggar":false,"Poggare":false,"Poggare Remastered":false,"Poggareku":false,"Poggare 2_0":false,"Copy of Poggare 3_0":false,"Pyrite - Test":false,"Copy of Pyrite - Test":false,"Poggare 4_0":false,"Poggare 2_6_0":false,"Poggare 5_0":false,"CotiRUBARE":false,"idk":false,"idk2":false,"RTG_ New":false,"Kokos--":false,"Mnew worlde":false,"Manuver":false,"Copy of Manuver":false,"Copy of Copy of Manuver":false,"Copy of Copy of Copy of Manuver":false,"Copy of Copy of Copy of Copy of":false,"tesko":false,"New Underdog World":false,"Copy of New Underdog World":false,"New Underdog World-":false,"New Underdog World--":false,"Underdoge":false,"New Underdog World---":false,"Performancer":false,"Teskopo":false,"89491948814":false,"New Underdog World----":false,"Igen":false,"IceIceBaby":false},"stepup":false,"fovChanges":true}
{"timeOfDayOverlay":{"New World----------------":false,"New World---------------":false,"New World--------------":false,"Rockharaght":false,"New World-------------":false,"-test":false,"New World--":false,"savedongo":false,"51.89.8.171:25565":false,"kokos-":false,"New World-----------------":false,"New World------------------":false,"Testtttt":false,"NewJoe":false,"New World-------------------":false,"Copy of New World-":false,"Water-Test":false,"Water-Rest":false,"New World--------------------":false,"LetsGoooou":false,"Mangroove":false,"New World---------------------":false,"New World----------------------":false,"Copy of New World--":false,"New World-----------------------":false,"New World------------------------":false,"New World-------------------------":false,"New World--------------------------":false,"New World---------------------------":false,"New World----------------------------":false,"New World-----------------------------":false,"New World------------------------------":false,"Zarastene":false,"New World-------------------------------":false,"Wasteland":false,"New World--------------------------------":false,"New World---------------------------------":false,"New World----------------------------------":false,"Copy of New World---":false,"New World-----------------------------------":false,"New World------------------------------------":false,"Testujem":false,"New World-------------------------------------":false,"New World--------------------------------------":false,"Skuska1000":false,"New World---------------------------------------":false,"Mesa":false,"New World----------------------------------------":false,"New World-----------------------------------------":false,"New World------------------------------------------":false,"New World-------------------------------------------":false,"Savana Bitch":false,"lopotok":false,"New World--------------------------------------------":false,"New World---------------------------------------------":false,"New World----------------------------------------------":false,"Copy of Mesa":false,"Geography":false,"GeoCraft":false,"New World-----------------------------------------------":false,"Teeest":false,"New World":false,"New World-":false,"New World------":false,"New World-------":false,"New World------------------------------------------------":false,"New World-------------------------------------------------":false,"New World--------------------------------------------------":false,"New World---------------------------------------------------":false,"New World----------------------------------------------------":false,"New World-----------------------------------------------------":false,"New World------------------------------------------------------":false,"Chtest":false,"New World-------------------------------------------------------":false,"Idkokos":false,"Saktest":false,"New Worldf":false,"New World--------------------------------------------------------":false,"New teskto":false,"New World---------------------------------------------------------":false,"Copy of Rockharaght":false,"Randomero":false,"efegfefefe":false,"Test Layers":false,"underdog.modded.fun":false,"teeeeeeeeskokos":false,"Test craters":false,"GRASS":false,"Quests Making 2":false,"Quests Making":false,"Quest Making 3":false,"Poggar":false,"Poggare":false,"Poggare Remastered":false,"Poggareku":false,"Poggare 2_0":false,"Copy of Poggare 3_0":false,"Pyrite - Test":false,"Copy of Pyrite - Test":false,"Poggare 4_0":false,"Poggare 2_6_0":false,"Poggare 5_0":false,"CotiRUBARE":false,"idk":false,"idk2":false,"RTG_ New":false,"Kokos--":false,"Mnew worlde":false,"Manuver":false,"Copy of Manuver":false,"Copy of Copy of Manuver":false,"Copy of Copy of Copy of Manuver":false,"Copy of Copy of Copy of Copy of":false,"tesko":false,"New Underdog World":false,"Copy of New Underdog World":false,"New Underdog World-":false,"New Underdog World--":false,"Underdoge":false,"New Underdog World---":false,"Performancer":false,"Teskopo":false,"89491948814":false,"New Underdog World----":false,"Igen":false,"IceIceBaby":false,"Underdog Playtrough":false},"stepup":false,"fovChanges":true}
12 changes: 12 additions & 0 deletions pax/modpack/overrides/scripts/CraftTweaker/Woodworking/Others.zs
Original file line number Diff line number Diff line change
Expand Up @@ -54,3 +54,15 @@ recipes.remove(<rustic:cabinet>);
recipes.addShapedMirrored("cabinet_fixed", <rustic:cabinet>,
[[<ore:plankWood>, <ore:trapdoorWood> ],
[<ore:plateIron>, <ore:stickIron> ]]);

// Wooden Hopper
RecipeUtils.tweakRecipe(true, <tconstruct:wooden_hopper>,
[[<ore:lumber>, null , <ore:lumber> ],
[<ore:lumber>, <ore:chestWood>, <ore:lumber> ],
[null , <ore:lumber> , null ]]);

// Covered Wagon
RecipeUtils.tweakRecipe(true, <animania:item_wagon>,
[[<ore:blockWool> , <ore:blockWool> , <ore:lumber> ],
[<minecraft:bed> , <ore:lumber> , <ore:chestWood> ],
[<animania:wheel>, <animania:item_cart>, <animania:wheel> ]]);
2 changes: 1 addition & 1 deletion pax/serverpack/serverpackcreator.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#Mon Sep 12 23:13:20 CEST 2022
#Sat Dec 03 23:07:41 CET 2022
de.griefed.serverpackcreator.configuration.hastebinserver=https\://haste.zneix.eu/documents
de.griefed.serverpackcreator.curseforge.cleanup.enabled=true
de.griefed.serverpackcreator.language=en_us
Expand Down

0 comments on commit fdbc694

Please sign in to comment.