Jika/TFG
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #208 from TerraFirmaGreg-Team/0.7.0

Browse Source 
Обновление 0.6.7
This commit is contained in:
Dmitry
2024-01-24 11:17:11 +07:00
committed by GitHub
parent 4181d69ece eab1f78eba
commit 72e2754c12
33 changed files with 348 additions and 937 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
.gitignore vendored
View File

@@ -59,16 +59,4 @@ knownkeys.txt
# Server Pack
.github/buildtools/serverpack/logs/
.github/buildtools/serverpack/world/
.github/buildtools/serverpack/config/
.github/buildtools/serverpack/crash-reports/
.github/buildtools/serverpack/kubejs/
.github/buildtools/serverpack/mods/
.github/buildtools/serverpack/local/
.github/buildtools/serverpack/xaerominimap-common.txt
.github/buildtools/serverpack/xaeroworldmap-common.txt
.github/buildtools/serverpack/banned-ips.json
.github/buildtools/serverpack/banned-players.json
.github/buildtools/serverpack/ops.json
.github/buildtools/serverpack/whitelist.json
.github/buildtools/serverpack/*

10
CHANGELOG_EN.md
View File

@@ -1,5 +1,15 @@
# Changelog
## [0.6.7] - ?
### Изменения
- The toolheads have been removed from the materials, and since they should not exist, we clean up after Greg again.
- Added and optimized a lot of mods/configs for optimization.
- Added QOL mods.
- F11 is now working correctly.
- Fixes to work with the latest greg.
- Fixed latex bucket quest.
- Fixed strings quest.
## [0.6.6] - 21.01.2024
### Изменения
- Fixed a lot of recipes with unknown tags.

10
CHANGELOG_RU.md
View File

@@ -1,5 +1,15 @@
# Changelog
## [0.6.7] - ?
### Изменения
- Удалены оголовья из материалов, и зкоторых он не должны существовать, опять подчищаем за грегом.
- Добавлено и оптимизировано множество модов/конфигов на оптимизацию.
- Добавлены QOL моды.
- F11 теперь работает правильно.
- Исправления для работы с последним грегом.
- Исправлен квест на ведро латекса.
- ИСправлен квест на нитки.
## [0.6.6] - 21.01.2024
### Изменения
- Исправлено множество рецептов с неизвестными тегами.

213
config/attributefix.json Normal file
View File

@@ -0,0 +1,213 @@
{
"attributes": {
"forge:step_height_addition": {
"enabled": false,
"min": {
"default": -512,
"value": -512
},
"max": {
"default": 512,
"value": 512
}
},
"minecraft:generic.follow_range": {
"enabled": true,
"min": {
"default": 0,
"value": 0
},
"max": {
"default": 2048,
"value": 2048
}
},
"minecraft:generic.flying_speed": {
"enabled": true,
"min": {
"default": 0,
"value": 0
},
"max": {
"default": 1024,
"value": 1024
}
},
"forge:nametag_distance": {
"enabled": false,
"min": {
"default": 0,
"value": 0
},
"max": {
"default": 64,
"value": 64
}
},
"minecraft:generic.movement_speed": {
"enabled": true,
"min": {
"default": 0,
"value": 0
},
"max": {
"default": 1024,
"value": 1024
}
},
"forge:entity_gravity": {
"enabled": false,
"min": {
"default": -8,
"value": -8
},
"max": {
"default": 8,
"value": 8
}
},
"forge:block_reach": {
"enabled": false,
"min": {
"default": 0,
"value": 0
},
"max": {
"default": 1024,
"value": 1024
}
},
"minecraft:generic.max_health": {
"enabled": true,
"min": {
"default": 1,
"value": 1
},
"max": {
"default": 1024,
"value": 1000000
}
},
"minecraft:generic.attack_speed": {
"enabled": true,
"min": {
"default": 0,
"value": 0
},
"max": {
"default": 1024,
"value": 1024
}
},
"minecraft:generic.attack_damage": {
"enabled": true,
"min": {
"default": 0,
"value": 0
},
"max": {
"default": 2048,
"value": 1000000
}
},
"minecraft:generic.luck": {
"enabled": true,
"min": {
"default": -1024,
"value": -1024
},
"max": {
"default": 1024,
"value": 1024
}
},
"minecraft:zombie.spawn_reinforcements": {
"enabled": true,
"min": {
"default": 0,
"value": 0
},
"max": {
"default": 1,
"value": 1
}
},
"minecraft:horse.jump_strength": {
"enabled": true,
"min": {
"default": 0,
"value": 0
},
"max": {
"default": 2,
"value": 2
}
},
"minecraft:generic.attack_knockback": {
"enabled": true,
"min": {
"default": 0,
"value": 0
},
"max": {
"default": 5,
"value": 1000000
}
},
"minecraft:generic.armor": {
"enabled": true,
"min": {
"default": 0,
"value": 0
},
"max": {
"default": 30,
"value": 1000000
}
},
"forge:swim_speed": {
"enabled": false,
"min": {
"default": 0,
"value": 0
},
"max": {
"default": 1024,
"value": 1024
}
},
"minecraft:generic.knockback_resistance": {
"enabled": true,
"min": {
"default": 0,
"value": 0
},
"max": {
"default": 1,
"value": 1
}
},
"minecraft:generic.armor_toughness": {
"enabled": true,
"min": {
"default": 0,
"value": 0
},
"max": {
"default": 20,
"value": 1000000
}
},
"forge:entity_reach": {
"enabled": false,
"min": {
"default": 0,
"value": 0
},
"max": {
"default": 1024,
"value": 1024
}
}
}
}

7
config/chat_heads.json5 Normal file
View File

@@ -0,0 +1,7 @@
{
"offsetNonPlayerText": true,
"senderDetection": "UUID_AND_HEURISTIC",
"smartHeuristics": true,
"handleSystemMessages": true,
"nameAliases": { }
}

34
config/connectivity.json
View File

@@ -1,34 +0,0 @@
{
"disableLoginLimits": {
"desc:": "Should login packet size limits be disabled? Error:(IOException(\"Payload may not be larger than 1048576 bytes\")) default:true",
"disableLoginLimits": true
},
"disablePacketLimits": {
"desc:": "Should play packet size limits be disabled? Error:(Badly compressed packet) default:true",
"disablePacketLimits": true
},
"disableChatVerificationDisconnect": {
"desc:": "(Clientside) Disables players disconnecting on chat message verification problems,(enable debugPrintMessages to see the message causing issues). default:true",
"disableChatVerificationDisconnect": true
},
"debugPrintMessages": {
"desc:": "Enable addition debug logging for networking errors. default:false",
"debugPrintMessages": false
},
"logintimeout": {
"desc:": "Set the max login timeout in seconds. default = 120",
"logintimeout": 2400
},
"disconnectTimeout": {
"desc:": "Set the ingame disconnect timeout for disconnecting players. Default = 60sec",
"disconnectTimeout": 60
},
"packetHistoryMinutes": {
"desc:": "Set the amount of minutes for which network packet history data is saved. Default = 5 minutes",
"packetHistoryMinutes": 5
},
"showFullResourceLocationException": {
"desc:": "Enable to see the full log output for all resource location exceptions. Default = false",
"showFullResourceLocationException": false
}
}

2
config/craftpresence.json
View File

@@ -150,7 +150,7 @@
"stripTranslationColors": false,
"stripExtraGuiElements": false,
"renderTooltips": true,
"configKeyCode": -1
"configKeyCode": 0
},
"displaySettings": {
"presenceData": {

12
config/embeddium++.toml
View File

@@ -82,11 +82,19 @@
onTileEntities = true
#Configure how fast light whould be updated
#Allowed Values: OFF, SLOW, NORMAL, FAST, SUPERFAST, FASTESTS, REALTIME
updateSpeed = "REALTIME"
updateSpeed = "NORMAL"
#Toggle if Entities should have dynamic lights
onEntities = true
updateOnlyOnPositionChange = true
[embeddiumplus.others]
#Configure if borderless fullscreen option should be attached to F11 or replace vanilla fullscreen
#Allowed Values: ATTACH, REPLACE, OFF
borderlessAttachModeOnF11 = "OFF"
#Toggles fast language reload
#Embeddedt points it maybe cause troubles to JEI, so ¿why not add it as a toggleable option?
fastLanguageReload = true
[embeddiumplus.quality]
#Chunks fade in speed
#This option doesn't affect performance, just changes speed
@@ -95,7 +103,7 @@
#Raise clouds
#Modify clouds height perfect for a adaptative world experience
#Range: 0 ~ 320
cloudsHeight = 128
cloudsHeight = 256
#Toggle fog feature
#Fog was a vanilla feature, toggling off may increases performance
fog = true

9
config/embeddium++mixin.toml
View File

@@ -1,9 +0,0 @@
[mixin]
[mixin.languageScreen]
fastreload = true
[mixin.borderless]
f11 = false

462
config/emi.css
View File

@@ -1,462 +0,0 @@
/** EMI Config */
#general {
/**
* Whether EMI is enabled and visible.
*/
enabled: true;
/**
* Whether cheating in items is enabled.
*/
cheat-mode: true;
/**
* How much EMI should use tooltips and popups to show controls and information.
*/
help-level: normal;
/**
* Where EMI should pull stacks from to populate the index.
*/
index-source: creative;
/**
* Whether normal search queries should include the tooltip.
*/
search-tooltip-by-default: true;
/**
* Whether normal search queries should include the mod name.
*/
search-mod-name-by-default: false;
/**
* Whether normal search queries should include the stack's tags.
*/
search-tags-by-default: false;
}
#ui {
/**
* Which action should be performed when clicking the recipe book.
*/
recipe-book-action: toggle-craftables;
/**
* Where to display status effects in the inventory.
*/
effect-location: top;
/**
* Whether to display a gray overlay when hovering over a stack.
*/
show-hover-overlay: true;
/**
* Whether to add mod name to tooltips
*/
append-mod-id: true;
/**
* Whether to add mod name to item tooltips, in case another mod provides behavior
*/
append-item-mod-id: true;
/**
* Prevents recipes being quick crafted from shifting around under the cursor.
*/
miscraft-prevention: true;
/**
* The unit to display fluids as.
*/
fluid-unit: millibuckets;
/**
* Whether to use the batched render system. Batching is faster, but may have
* incompatibilities with shaders or other mods.
*/
use-batched-renderer: true;
/**
* Whether to have the search bar in the center of the screen, instead of to the
* side.
*/
center-search-bar: true;
/**
* Which sidebar type to switch to when searching.
*/
search-sidebar-focus: index;
/**
* Which sidebar type to focus when the search is empty.
*/
empty-search-sidebar-focus: none;
/**
* The amount of vertical margin to give in the recipe screen.
*/
vertical-margin: 20;
/**
* The minimum width of the recipe screen in pixels. Controls how many tabs there
* can be, and where the page switching buttons go. The default is 176, the width
* of most screens.
*/
minimum-recipe-screen-width: 176;
/**
* Where to show workstations in the recipe screen
*/
workstation-location: bottom;
/**
* Display cost per batch when hovering a recipe output
*/
show-cost-per-batch: true;
/**
* Whether recipes should have a button to set as default.
*/
recipe-default-button: true;
/**
* Whether recipes should have a button to show the recipe tree.
*/
recipe-tree-button: true;
/**
* Whether recipes should have a button to fill the ingredients in a handler.
*/
recipe-fill-button: true;
/**
* Whether recipes should have a button to take a screenshot of the recipe.
*/
recipe-screenshot-button: false;
/**
* The GUI scale at which recipe screenshots are saved. Use 0 to use the current
* GUI scale.
*/
recipe-screenshot-scale: 0;
/**
* The pages in the left sidebar
*/
left-sidebar-pages: favorites;
/**
* The subpanels in the left sidebar
*/
left-sidebar-subpanels: none;
/**
* How many columns and rows of ingredients to limit the left sidebar to
*/
left-sidebar-size: 12, 100;
/**
* How much space to maintain between the left sidebar and obstructions, in pixels
*/
left-sidebar-margins: 2, 2, 2, 2;
/**
* Where to position the left sidebar
*/
left-sidebar-align: left, top;
/**
* Whether to render the header buttons and page count for the left sidebar
*/
left-sidebar-header: visible;
/**
* Which theme to use for the left sidebar
*/
left-sidebar-theme: transparent;
/**
* The pages in the right sidebar
*/
right-sidebar-pages: index, craftables;
/**
* The subpanels in the right sidebar
*/
right-sidebar-subpanels: none;
/**
* How many columns and rows of ingredients to limit the right sidebar to
*/
right-sidebar-size: 12, 100;
/**
* How much space to maintain between the right sidebar and obstructions, in pixels
*/
right-sidebar-margins: 2, 2, 2, 2;
/**
* Where to position the right sidebar
*/
right-sidebar-align: right, top;
/**
* Whether to render the header buttons and page count for the right sidebar
*/
right-sidebar-header: visible;
/**
* Which theme to use for the right sidebar
*/
right-sidebar-theme: transparent;
/**
* The pages in the top sidebar
*/
top-sidebar-pages: none;
/**
* The subpanels in the top sidebar
*/
top-sidebar-subpanels: none;
/**
* How many columns and rows of ingredients to limit the top sidebar to
*/
top-sidebar-size: 9, 9;
/**
* How much space to maintain between the top sidebar and obstructions, in pixels
*/
top-sidebar-margins: 2, 2, 2, 2;
/**
* Where to position the top sidebar
*/
top-sidebar-align: center, center;
/**
* Whether to render the header buttons and page count for the top sidebar
*/
top-sidebar-header: visible;
/**
* Which theme to use for the top sidebar
*/
top-sidebar-theme: transparent;
/**
* The pages in the bottom sidebar
*/
bottom-sidebar-pages: none;
/**
* The subpanels in the bottom sidebar
*/
bottom-sidebar-subpanels: none;
/**
* How many columns and rows of ingredients to limit the bottom sidebar to
*/
bottom-sidebar-size: 9, 9;
/**
* How much space to maintain between the bottom sidebar and obstructions, in
* pixels
*/
bottom-sidebar-margins: 2, 2, 2, 2;
/**
* Where to position the bottom sidebar
*/
bottom-sidebar-align: center, center;
/**
* Whether to render the header buttons and page count for the bottom sidebar
*/
bottom-sidebar-header: visible;
/**
* Which theme to use for the bottom sidebar
*/
bottom-sidebar-theme: transparent;
}
#binds {
/**
* Toggle the visibility of EMI.
*/
toggle-visibility: "ctrl key.keyboard.o";
/**
* Focuse the search bar.
*/
focus-search: "ctrl key.keyboard.f";
/**
* Clears the search bar.
*/
clear-search: "key.keyboard.unknown";
/**
* Display the recipes for creating a stack.
*/
view-recipes: "key.keyboard.r";
view-recipes: "key.mouse.left";
/**
* Display the recipes that can be created using a stack.
*/
view-uses: "key.keyboard.u";
view-uses: "key.mouse.right";
/**
* Favorite the item to display on the side of the screen opposite of recipies for
* quick access.
*/
favorite: "key.keyboard.a";
/**
* Set the default recipe for a given stack in the output of a recipe to that
* recipe.
*/
default-stack: "ctrl key.mouse.left";
/**
* Display the recipe tree for a given stack.
*/
view-stack-tree: "key.keyboard.unknown";
/**
* Display the recipe tree.
*/
view-tree: "key.keyboard.unknown";
/**
* Return to the previous page in EMI.
*/
back: "key.keyboard.backspace";
/**
* Return to the next page in EMI after going back.
*/
forward: "key.keyboard.unknown";
/**
* When on a stack with an associated recipe:
* Move ingredients for a single result.
*/
craft-one: "key.mouse.left";
/**
* When on a stack with an associated recipe:
* Move ingredients for as many results as possible.
*/
craft-all: "shift key.mouse.left";
/**
* When on a stack with an associated recipe:
* Move ingredients for a single result and put in inventory if possible.
*/
craft-one-to-inventory: "key.keyboard.unknown";
/**
* When on a stack with an associated recipe:
* Move ingredients for as many results as possible and put in inventory if
* possible.
*/
craft-all-to-inventory: "key.keyboard.unknown";
/**
* When on a stack with an associated recipe:
* Move ingredients for a single result and put in cursor if possible.
*/
craft-one-to-cursor: "ctrl key.mouse.left";
/**
* Display the recipe that will be used to craft on a stack with no recipe context.
*/
show-craft: "key.keyboard.left.shift";
/**
* Cheat in one of an item into the inventory.
*/
cheat-one-to-inventory: "ctrl key.mouse.right";
/**
* Cheat in a stack of an item into the inventory.
*/
cheat-stack-to-inventory: "ctrl key.mouse.left";
/**
* Cheat in one of an item into the cursor.
*/
cheat-one-to-cursor: "ctrl key.mouse.middle";
/**
* Cheat in a stack of an item into the cursor.
*/
cheat-stack-to-cursor: "key.keyboard.unknown";
/**
* Delete the stack in the cursor when hovering the index
*/
delete-cursor-stack: "key.mouse.left";
/**
* Copies the hovered recipe's ID to the clipboard
*/
copy-recipe-id: "key.keyboard.keypad.5";
/**
* In edit mode, hide the hovered stack
*/
hide-stack: "ctrl key.mouse.left";
/**
* In edit mode, hide stacks with the hovered stack's id
*/
hide-stack-by-id: "ctrl shift key.mouse.left";
}
#dev {
/**
* Whether development functions should be enabled. Not recommended for general
* play.
*/
dev-mode: false;
/**
* Whether editing the index is enabled
*/
edit-mode: false;
/**
* Whether to log untranslated tags as warnings.
*/
log-untranslated-tags: false;
/**
* Whether to log ingredients that don't have a representative tag as warnings.
*/
log-non-tag-ingredients: false;
/**
* Whether hovering the output of a recipe should show the recipe's EMI ID.
*/
show-recipe-ids: true;
/**
* Whether stacks in the index should display a highlight if they have a recipe
* default.
*/
highlight-defaulted: false;
/**
* Whether to display exclusion areas
*/
highlight-exclusion-areas: false;
}

6
config/extendedcrafting-client.toml
View File

@@ -1,6 +0,0 @@
#Client settings.
[General]
#Should the Quantum Compressor render the result item above it?
enableCompressorRenderer = true

110
config/extendedcrafting-common.toml
View File

@@ -1,110 +0,0 @@
#Settings for Singularities.
[Singularities]
#Should the default recipe for the Ultimate Singularity be generated?
ultimateSingularityRecipe = true
#The default amount of items required to create a Singularity.
#Range: > 1
defaultMaterialsRequired = 10000
#Should default recipes be generated for Singularities?
defaultRecipes = true
#The default amount of FE required to create a Singularity.
#Range: > 0
defaultPowerRequired = 5000000
#Should the Singularities be enabled?
enabled = true
#The item to use as the Catalyst in default Singularity recipes.
defaultCatalyst = "extendedcrafting:ultimate_catalyst"
#Settings for the Crafting Core.
["Combination Crafting"]
#How much FE the Crafting Core should hold.
#Range: > 0
powerCapacity = 5000000
#How much FE/t the Crafting Core should use when crafting by default.
#Range: > 0
powerRate = 500
#Should the Crafting Core be enabled?
enabled = true
#Settings for general things.
[General]
#Should the Handheld Crafting Table be enabled?
handheldWorkbench = true
#Settings for the Extended Crafting Tables.
["Table Crafting"]
#How much FE the Auto Crafting Tables should hold. Higher tiers use double the previous tier.
#Range: > 0
autoTablePowerCapacity = 500000
#How much FE the Auto Crafting Tables should use when auto inserting items.
#Range: > 0
autoTableInsertPowerRate = 100
#Should the Basic Crafting Table inherit vanilla crafting recipes?
useVanillaRecipes = true
#Should the Extended Crafting Tables be enabled?
enabled = true
#Should the Auto Crafting Tables be enabled?
autoTablesEnabled = true
#How much FE the Auto Crafting Tables should use when crafting.
#Range: > 0
autoTablePowerRate = 500
#Settings for the Quantum Compressor.
["Quantum Compression"]
#How much FE the Quantum Compressor should hold.
#Range: > 0
powerCapacity = 10000000
#How much FE/t the Quantum Compressor should use when crafting by default.
#Range: > 0
powerRate = 5000
#Should the Quantum Compressor be enabled?
enabled = true
#Settings for the Recipe Maker.
["Recipe Maker"]
#Should the recipe maker add NBT tags when possible?
useNBT = true
#Should the recipe maker try to use tags when possible?
useTags = false
#Should the Recipe Maker be enabled?
enabled = true
#Settings for the Flux Crafter.
["Flux Crafting"]
#How much FE/t the Flux Crafter should pull from each Flux Alternator when crafting by default.
#Range: > 0
defaultPowerRate = 400
#How much FE the Flux Alternator should hold.
#Range: > 0
powerCapacity = 80000
#How much FE the Auto Flux Crafter should hold.
#Range: > 0
autoCrafterPowerCapacity = 500000
#How much FE the Auto Flux Crafter should use when auto inserting items.
#Range: > 0
autoCrafterInsertPowerRate = 100
#Should the Flux Crafter be enabled?
enabled = true
#Should the Auto Flux Crafter be enabled?
autoCrafterEnabled = true
#Settings for the Ender Crafter.
["Ender Crafting"]
#How long a single Ender Crafter crafting operation should take (in seconds) by default.
#Range: > 1
defaultTimeRequired = 60
#How much FE the Auto Ender Crafter should hold.
#Range: > 0
autoCrafterPowerCapacity = 500000
#How much FE the Auto Ender Crafter should use when auto inserting items.
#Range: > 0
autoCrafterInsertPowerRate = 100
#How much a single Ender Alternator should speed up a craft. This is a percentage of the time required.
#Range: 0.0 ~ 1.0
alternatorEffectiveness = 0.01
#Should the Ender Crafter be enabled?
enabled = true
#Should the Auto Ender Crafter be enabled?
autoCrafterEnabled = true

2
config/fastbench.cfg
View File

@@ -5,7 +5,7 @@
general {
# If the recipe book button is removed.
# Default: true
B:"Remove Recipe Book Button"=true
B:"Remove Recipe Book Button"=false
# If the crafting table has a tooltip
# Default: false

9
config/firstperson.json
View File

@@ -1,4 +1,5 @@
{
"configVersion": 1,
"enabledByDefault": false,
"xOffset": 0,
"sneakXOffset": 0,
@@ -6,11 +7,5 @@
"renderStuckFeatures": true,
"vanillaHands": false,
"doubleHands": false,
"forceActive": false,
"autoVanillaHands": [
"twilightforest:filled_ore_map",
"twilightforest:filled_magic_map",
"twilightforest:filled_maze_map",
"antiqueatlas:antique_atlas"
]
"autoVanillaHands": []
}

19
config/ftbquests/quests/chapters/primitive_age.snbt
View File

@@ -2924,10 +2924,19 @@
]
id: "7C3F180555E12A88"
tasks: [{
amount: 1L
fluid: "gtceu:latex"
id: "0CE60474774B2645"
type: "fluid"
id: "4DB6481F8CA18725"
item: {
Count: 1b
id: "tfc:wooden_bucket"
tag: {
fluid: {
Amount: 1000
FluidName: "gtceu:latex"
}
}
}
match_nbt: true
type: "item"
}]
x: -8.0d
y: 5.0d
@@ -4346,7 +4355,6 @@
"6E24ECF6CEE950D1"
]
id: "34ABDCB5BA778DE4"
min_required_dependencies: 16
tasks: [{
count: 16L
id: "2579EAFE552BA628"
@@ -4710,6 +4718,7 @@
id: "toolbelt:belt"
tag: { }
}
match_nbt: false
type: "item"
}
{

4
config/ftbxmodcompat.snbt
View File

@@ -3,11 +3,11 @@
# DEFAULT: use FTB Ranks then Luckperms in preference order, depending on mod availability
# Default: "default"
# Valid values: "default", "ftb_ranks", "luckperms"
permission_selector: "default"
permission_selector: "ftb_ranks"
# Select the game stages implementation to use
# DEFAULT: use KubeJS, Game Stages, vanilla in preference order, depending on mod availability
# Default: "default"
# Valid values: "default", "vanilla", "kubejs", "gamestages"
stage_selector: "default"
stage_selector: "kubejs"
}

17
config/gtceu.yaml
View File

@@ -1,7 +1,7 @@
recipes:
# Whether to generate Flawed and Chipped Gems for materials and recipes involving them.
# Useful for mods like TerraFirmaCraft.
# Default: true
# Default: false
generateLowQualityGems: true
# Whether to remove Block/Ingot compression and decompression in the Crafting Table.
@@ -12,7 +12,7 @@ recipes:
# Default: false
harderRods: true
# Whether to make crafting recipes for Bricks, Firebricks, and Coke Bricks harder.
# Whether to make crafting recipes for Bricks, Firebricks, Nether Bricks, and Coke Bricks harder.
# Default: false
harderBrickRecipes: false
@@ -87,6 +87,15 @@ worldgen:
# Default: false (no falling ores)
sandOresFall: false
# Whether to increase number of rolls for dungeon chests. Increases dungeon loot drastically.
# Default: true
# WARNING: Currently unimplemented.
increaseDungeonLoot: false
# Allow GregTech to add additional GregTech Items as loot in various structures.
# Default: true
addLoot: false
oreVeins:
# The grid size (in chunks) for ore vein generation
# Default: 3
@@ -279,6 +288,10 @@ compat:
removeSmeltingForEBFMetals: true
dev:
# Debug general events? (will print placed veins to server's debug.log)
# Default: false
debug: false
# Debug ore vein placement? (will print placed veins to server's debug.log)
# Default: false (no placement printout in debug.log)
debugWorldgen: false

22
config/immediatelyfast.json Normal file
View File

@@ -0,0 +1,22 @@
{
"REGULAR_INFO": "----- Regular config values below -----",
"font_atlas_resizing": true,
"map_atlas_generation": true,
"hud_batching": false,
"fast_text_lookup": true,
"fast_buffer_upload": true,
"fast_buffer_upload_size_mb": 256,
"fast_buffer_upload_explicit_flush": true,
"COSMETIC_INFO": "----- Cosmetic only config values below (Does not optimize anything) -----",
"dont_add_info_into_debug_hud": false,
"EXPERIMENTAL_INFO": "----- Experimental config values below (Rendering glitches may occur) -----",
"experimental_disable_error_checking": false,
"experimental_disable_resource_pack_conflict_handling": false,
"experimental_sign_text_buffering": false,
"experimental_screen_batching": false,
"DEBUG_INFO": "----- Debug only config values below (Do not touch) -----",
"debug_only_and_not_recommended_disable_universal_batching": false,
"debug_only_and_not_recommended_disable_mod_conflict_handling": false,
"debug_only_and_not_recommended_disable_hardware_conflict_handling": false,
"debug_only_print_additional_error_information": false
}

0
config/jei/blacklist.cfg
View File

141
config/jei/jei-client.ini
View File

@@ -1,141 +0,0 @@
[advanced]
# Description: Display search bar in the center
# Valid Values: [true, false]
# Default Value: false
CenterSearch = false
# Description: Set low-memory mode (makes search very slow, but uses less RAM)
# Valid Values: [true, false]
# Default Value: false
LowMemorySlowSearchEnabled = false
# Description: Enable cheating items into the hotbar by using the shift+number keys.
# Valid Values: [true, false]
# Default Value: false
CheatToHotbarUsingHotkeysEnabled = false
# Description: Enable adding new bookmarks to the front of the bookmark list.
# Valid Values: [true, false]
# Default Value: true
AddBookmarksToFrontEnabled = true
# Description: When looking up recipes with items that contain fluids, also look up recipes for the fluids.
# Valid Values: [true, false]
# Default Value: false
LookupFluidContents = false
# Description: How items should be handed to you
# Valid Values: [INVENTORY, MOUSE_PICKUP]
# Default Value: MOUSE_PICKUP
GiveMode = MOUSE_PICKUP
# Description: Max. recipe gui height
# Valid Values: Any integer greater than or equal to 175
# Default Value: 350
RecipeGuiHeight = 350
[sorting]
# Description: Sorting order for the ingredient list
# Valid Values: A comma-separated list containing values of:
# [MOD_NAME, INGREDIENT_TYPE, ALPHABETICAL, CREATIVE_MENU, TAG, ARMOR, MAX_DURABILITY]
# Default Value: MOD_NAME, INGREDIENT_TYPE, CREATIVE_MENU
IngredientSortStages = MOD_NAME, INGREDIENT_TYPE, CREATIVE_MENU
[search]
# Description: Search mode for Mod Names (prefix: @)
# Valid Values: [ENABLED, REQUIRE_PREFIX, DISABLED]
# Default Value: REQUIRE_PREFIX
ModNameSearchMode = REQUIRE_PREFIX
# Description: Search mode for Tooltips (prefix: #)
# Valid Values: [ENABLED, REQUIRE_PREFIX, DISABLED]
# Default Value: ENABLED
TooltipSearchMode = ENABLED
# Description: Search mode for Tag Names (prefix: $)
# Valid Values: [ENABLED, REQUIRE_PREFIX, DISABLED]
# Default Value: REQUIRE_PREFIX
TagSearchMode = REQUIRE_PREFIX
# Description: Search mode for Colors (prefix: ^)
# Valid Values: [ENABLED, REQUIRE_PREFIX, DISABLED]
# Default Value: DISABLED
ColorSearchMode = DISABLED
# Description: Search mode for resources locations (prefix: &)
# Valid Values: [ENABLED, REQUIRE_PREFIX, DISABLED]
# Default Value: DISABLED
ResourceLocationSearchMode = DISABLED
# Description: Search advanced tooltips (visible with F3+H)
# Valid Values: [true, false]
# Default Value: false
SearchAdvancedTooltips = false
[IngredientList]
# Description: Max number of rows shown
# Valid Values: An integer in the range [1, 100] (inclusive)
# Default Value: 16
MaxRows = 16
# Description: Max number of columns shown
# Valid Values: An integer in the range [4, 100] (inclusive)
# Default Value: 9
MaxColumns = 9
# Description: Horizontal alignment of the ingredient grid inside the available area
# Valid Values: [LEFT, CENTER, RIGHT]
# Default Value: RIGHT
HorizontalAlignment = RIGHT
# Description: Vertical alignment of the ingredient grid inside the available area
# Valid Values: [TOP, CENTER, BOTTOM]
# Default Value: TOP
VerticalAlignment = TOP
# Description: Visibility of the top page buttons. Use AUTO_HIDE to only show it when there are multiple pages.
# Valid Values: [ENABLED, AUTO_HIDE, DISABLED]
# Default Value: ENABLED
ButtonNavigationVisibility = ENABLED
# Description: Set to true to draw a background texture behind the gui.
# Valid Values: [true, false]
# Default Value: false
DrawBackground = false
[BookmarkList]
# Description: Max number of rows shown
# Valid Values: An integer in the range [1, 100] (inclusive)
# Default Value: 16
MaxRows = 16
# Description: Max number of columns shown
# Valid Values: An integer in the range [4, 100] (inclusive)
# Default Value: 9
MaxColumns = 9
# Description: Horizontal alignment of the ingredient grid inside the available area
# Valid Values: [LEFT, CENTER, RIGHT]
# Default Value: LEFT
HorizontalAlignment = LEFT
# Description: Vertical alignment of the ingredient grid inside the available area
# Valid Values: [TOP, CENTER, BOTTOM]
# Default Value: TOP
VerticalAlignment = TOP
# Description: Visibility of the top page buttons. Use AUTO_HIDE to only show it when there are multiple pages.
# Valid Values: [ENABLED, AUTO_HIDE, DISABLED]
# Default Value: ENABLED
ButtonNavigationVisibility = ENABLED
# Description: Set to true to draw a background texture behind the gui.
# Valid Values: [true, false]
# Default Value: false
DrawBackground = false

8
config/jei/jei-colors.ini
View File

@@ -1,8 +0,0 @@
[colors]
# Description: Color values to search for
# Valid Values: A comma-separated list containing values of:
# Any color name and an RGB hex color, separated by a ':'
# Default Value: White:EEEEEE, LightBlue:7492CC, Cyan:00EEEE, Blue:2222DD, LapisBlue:25418B, Teal:008080, Yellow:CACB58, GoldenYellow:EED700, Orange:D97634, Pink:D1899D, HotPink:FC0FC0, Magenta:B24BBB, Purple:813EB9, EvilPurple:2E1649, Lavender:B57EDC, Indigo:480082, Sand:DBD3A0, Tan:BB9B63, LightBrown:A0522D, Brown:634B33, DarkBrown:3A2D13, LimeGreen:43B239, SlimeGreen:83CB73, Green:008000, DarkGreen:224D22, GrassGreen:548049, Red:963430, BrickRed:B0604B, NetherBrick:2A1516, Redstone:CE3E36, Black:181515, CharcoalGray:464646, IronGray:646464, Gray:808080, Silver:C0C0C0
SearchColors = White:EEEEEE, LightBlue:7492CC, Cyan:00EEEE, Blue:2222DD, LapisBlue:25418B, Teal:008080, Yellow:CACB58, GoldenYellow:EED700, Orange:D97634, Pink:D1899D, HotPink:FC0FC0, Magenta:B24BBB, Purple:813EB9, EvilPurple:2E1649, Lavender:B57EDC, Indigo:480082, Sand:DBD3A0, Tan:BB9B63, LightBrown:A0522D, Brown:634B33, DarkBrown:3A2D13, LimeGreen:43B239, SlimeGreen:83CB73, Green:008000, DarkGreen:224D22, GrassGreen:548049, Red:963430, BrickRed:B0604B, NetherBrick:2A1516, Redstone:CE3E36, Black:181515, CharcoalGray:464646, IronGray:646464, Gray:808080, Silver:C0C0C0

12
config/jei/jei-debug.ini
View File

@@ -1,12 +0,0 @@
[debug]
# Description: Debug mode enabled
# Valid Values: [true, false]
# Default Value: false
DebugMode = false
# Description: Debug inputs enabled
# Valid Values: [true, false]
# Default Value: false
DebugInputs = false

11
config/jei/jei-mod-id-format.ini
View File

@@ -1,11 +0,0 @@
[modname]
# Description: Formatting for mod name tooltip
# Valid Values: A chat formatting string.
# Use these formatting colors:
# black dark_blue dark_green dark_aqua dark_red dark_purple gold gray dark_gray blue green aqua red light_purple yellow white
# With these formatting options:
# obfuscated bold strikethrough underline italic
# Default Value: blue italic
ModNameFormat = blue italic

83
config/jei/recipe-category-sort-order.ini
View File

@@ -1,83 +0,0 @@
minecraft:crafting
minecraft:anvil
minecraft:blasting
minecraft:brewing
minecraft:campfire
minecraft:compostable
minecraft:fuel
minecraft:furnace
minecraft:smithing
minecraft:smoking
minecraft:stonecutting
ae2:attunement
ae2:certus_growth
ae2:charger
ae2:condenser
ae2:entropy
ae2:inscriber
ae2:item_transformation
create:automatic_brewing
create:automatic_packing
create:automatic_shaped
create:automatic_shapeless
create:block_cutting
create:crushing
create:deploying
create:draining
create:fan_blasting
create:fan_haunting
create:fan_smoking
create:fan_washing
create:item_application
create:mechanical_crafting
create:milling
create:mixing
create:mystery_conversion
create:packing
create:pressing
create:sandpaper_polishing
create:sawing
create:sequenced_assembly
create:spout_filling
create:wood_cutting
createaddition:charging
createaddition:liquid_burning
createaddition:rolling
exposure:photograph_printing
exposure:photograph_stacking
firmalife:drying
firmalife:mixing_bowl
firmalife:oven
firmalife:smoking
firmalife:vat
ftbquests:loot_crate
ftbquests:quest
jei:information
jumbofurnace:jumbo_furnace_upgrade
jumbofurnace:jumbo_smelting
morered:soldering
tfc:alloying
tfc:anvil
tfc:blast_furnace
tfc:bloomery
tfc:casting
tfc:chisel
tfc:clay_knapping
tfc:fire_clay_knapping
tfc:glassworking
tfc:goat_horn_knapping
tfc:heating
tfc:instant_barrel
tfc:instant_fluid_barrel
tfc:jam_pot
tfc:leather_knapping
tfc:loom
tfc:pumpkin_knapping
tfc:quern
tfc:rock_knapping
tfc:scraping
tfc:sealed_barrel
tfc:simple_pot
tfc:soup_pot
tfc:welding
treetap:tap_extract

5
config/canary.properties → config/lithium.properties
View File

@@ -1,9 +1,8 @@
# This is the configuration file for Canary.
# This is the configuration file for Radium.
# This file exists for debugging purposes and should not be configured otherwise.
# Before configuring anything, take a backup of the worlds that will be opened.
#
# You can find information on editing this file and all the available options here:
# https://github.com/AbdElAziz333/Canary/wiki/Configuration-File
# https://github.com/jellysquid3/lithium-fabric/wiki/Configuration-File
#
# By default, this file will be empty except for this notice.

21
config/modelfix-client.toml Normal file
View File

@@ -0,0 +1,21 @@
[default]
#quad expansion increment. enlarges each quad. Use to hide gaps. Keep both as close to 0 as possible
#Range: -0.1 ~ 0.1
item_quad_expansion = 0.008
#quad x/y offset. simply put moves the quad toward the center of the item. Use to hide gaps
#Range: -0.1 ~ 0.1
item_quad_indent = 0.007
[mac_os]
#It has been reported that some mac os systems are affected by atlass bleeding so the mod cant apply its main fix by removing atlas shrinking. Instead it can reduce it as much as possible by multiplying it by shrink_value_multiplier
#quad expansion increment. enlarges each quad. Use to hide gaps. Keep both as close to 0 as possible
#Range: -0.1 ~ 0.1
item_quad_expansion = 0.04
#quad x/y offset. simply put moves the quad toward the center of the item. Use to hide gaps
#Range: -0.1 ~ 0.1
item_quad_indent = 0.0099
#set to 0 for non macos behavior. 1 keeps vanilla behavior to prevent atlas bleeding
#Range: 0.0 ~ 1.0
shrink_ratio_multiplier = 1.0

2
config/railways-common.toml
View File

@@ -5,5 +5,5 @@ registerMissingTracks = false
#.
#Disable Steam 'n' Rails datafixers. Do not enable this config if your world contains pre-Create 0.5.1 monobogeys, because then they will be destroyed
#[@cui:RequiresReload:both]
disableDatafixer = false
disableDatafixer = true

14
config/roughlyenoughitems/config.json5
View File

@@ -1,14 +1,10 @@
{
"basics": {
"favorites": [
"{id:\"ftbteams:my_team\",json:'{\"group\":\"ftblibrary:info\",\"icon\":\"ftbteams:textures/teams.png\",\"x\":0,\"click\":\"ftbteams:open_gui\",\"loading_screen\":true}',type:\"ftblibrary:sidebar_button\"}",
"{id:\"ftbquests:quests\",json:'{\"group\":\"ftblibrary:info\",\"icon\":\"ftbquests:item/book\",\"x\":610,\"click\":\"ftbquests:open_gui\",\"required_server_mods\":[\"ftbquests\"],\"custom_text\":true}',type:\"ftblibrary:sidebar_button\"}",
"{id:\"ftbessentials:trash_can\",json:'{\"group\":\"ftblibrary:util\",\"icon\":\"ftblibrary:icons/bin\",\"x\":150,\"click\":\"command:/trashcan\",\"required_server_mods\":[\"ftbessentials\"]}',type:\"ftblibrary:sidebar_button\"}"
],
"favorites": [],
"hiddenFavorites": [],
"displayHistory": [],
// Declares whether cheating mode is on.
"cheating": true,
"cheating": false,
"favoritesEnabled": true,
"keyBindings": {
"recipeKeybind": {
@@ -20,8 +16,8 @@
"modifier": 0
},
"hideKeybind": {
"keyCode": "key.keyboard.o",
"modifier": 2
"keyCode": "key.keyboard.unknown",
"modifier": 0
},
"previousPageKeybind": {
"keyCode": "key.keyboard.unknown",
@@ -163,7 +159,7 @@
"functionality": {
"inputMethod": null,
// Declares whether REI should remove the recipe book.
"disableRecipeBook": true,
"disableRecipeBook": false,
// Declares whether mob effects should be on the left side instead of the right side.
"leftSideMobEffects": true,
// Declares whether subsets is enabled.

8
config/rrls.toml Normal file
View File

@@ -0,0 +1,8 @@
enabled = true
rgbProgress = false
loadingScreenHide = false
showIn = "ALL"
type = "PROGRESS"
reloadText = ""
resetResources = false
reInitScreen = true

12
config/serverconfigupdater-common.toml
View File

@@ -1,12 +0,0 @@
["Version Configuration"]
# Define a version here. On world load the mod will look up the serverconfig version and reset all files that specified up to the newest version.
# Example: ["1=minecraft","2=forge"] will reset minecraft and forge config on first load, but will only reset forge if the world has been loaded before with only version 1 defined
versions = [""]
["File Deleter"]
# This is intended for deleting files for pack updates. This is a last resort! Replace with empty files instead when possible. The file will be deleted every launch if it exists! Specify the path to the file. Comma Separated List. Example: scripts/badscript.zs
files = [""]
# By default Folders are only deleted if they are empty. Set to true to change that.
deleteFoldersWithContent = false

2
kubejs/client_scripts/main_client_script.js
View File

@@ -43,7 +43,7 @@ const hideItems = (event) => {
hideMoreRedStuff(event)
hideRailWaysStuff(event)
hideCreateAdditionsStuff(event)
hideChiselAndBitsStuff(event)
// hideChiselAndBitsStuff(event)
hideFTBQuestsStuff(event)
}

2
kubejs/server_scripts/main_server_script.js
View File

@@ -105,7 +105,7 @@ ServerEvents.recipes(event => {
registerFTBQuestsRecipes(event)
registerChiselAndBitsRecipes(event)
// registerChiselAndBitsRecipes(event)
})
/**

2
mods

Submodule mods updated: 7fa418ec23...03fa8df176