diff --git a/config/createaddition-common.toml b/config/createaddition-common.toml new file mode 100644 index 000000000..82f022b8f --- /dev/null +++ b/config/createaddition-common.toml @@ -0,0 +1,145 @@ + +#Wires +[wires] + #Small Connector max output in FE/t (Energy transfer). + #Range: > 0 + small_connector_max_output = 1000 + #Small Connector max input in FE/t (Energy transfer). + #Range: > 0 + small_connector_max_input = 1000 + #Large Connector max wire length in blocks. + #Range: 0 ~ 256 + large_connector_wire_length = 32 + #Small Connector max wire length in blocks. + #Range: 0 ~ 256 + small_connector_wire_length = 16 + #Large Connector max input in FE/t (Energy transfer). + #Range: > 0 + large_connector_max_input = 5000 + #Allows blocks attached to a connector to freely pass energy to and from the connector network. + connector_allow_passive_io = true + #Large Connector max output in FE/t (Energy transfer). + #Range: > 0 + large_connector_max_output = 5000 + #Ignore checking if block face can support connector. + connector_ignore_face_check = true + +#Make sure config changes are duplicated on both Clients and the Server when running a dedicated Server, +# as the config isnt synced between Clients and Server. +#General Settings +[general] + #Max stress for the Alternator and Electric Motor (in SU at 256 RPM). + #Range: > 0 + max_stress = 16384 + #Forge Energy conversion rate (in FE/t at 256 RPM, value is the FE/t generated and consumed is at 256rpm). + #Range: > 0 + fe_at_max_rpm = 480 + +#Portable Energy Interface +[portable_energy_interface] + #PEI max output in FE/t (Energy transfer). + #Range: > 0 + pei_max_output = 5000 + #PEI max input in FE/t (Energy transfer). + #Range: > 0 + pei_max_input = 5000 + +#Electric Motor +[electric_motor] + #Electric Motor internal capacity in FE. + #Range: > 0 + motor_capacity = 5000 + #Electric Motor minimum required energy consumption in FE/t. + #Range: > 0 + motor_min_consumption = 8 + #Electric Motor max input in FE (Energy transfer not consumption). + #Range: > 0 + motor_max_input = 5000 + #Electric Motor min/max RPM. + #Range: > 1 + motor_rpm_range = 256 + +#Tesla Coil +[tesla_coil] + #Tesla Coil charge rate in FE/t. + #Range: > 0 + tesla_coil_charge_rate = 5000 + #Tesla Coil fire interval (in ticks). + #Range: > 0 + tesla_coil_fire_cooldown = 20 + #Hurt range (in blocks/meters). + #Range: > 0 + tesla_coil_hurt_range = 3 + #Tesla Coil internal capacity in FE. + #Range: > 0 + tesla_coil_capacity = 40000 + #Energy consumed when Tesla Coil is fired (in FE). + #Range: > 0 + tesla_coil_hurt_energy_required = 1000 + #The duration of the Shocked effect for mobs (in ticks). + #Range: > 0 + tesla_coil_effect_time_mob = 20 + #The duration of the Shocked effect for players (in ticks). + #Range: > 0 + tesla_coil_effect_time_player = 20 + #Tesla Coil max input in FE/t (Energy transfer). + #Range: > 0 + tesla_coil_max_input = 10000 + #Tesla Coil charge rate in FE/t for recipes. + #Range: > 0 + tesla_coil_recipe_charge_rate = 2000 + #Damaged dealt to mobs when Tesla Coil is fired (in half hearts). + #Range: > 0 + tesla_coil_hurt_mob = 3 + #Damaged dealt to players when Tesla Coil is fired (in half hearts). + #Range: > 0 + tesla_coil_hurt_player = 2 + +#Alternator +[alternator] + #Alternator efficiency relative to base conversion rate. + #Range: 0.01 ~ 1.0 + generator_efficiency = 0.75 + #Alternator internal capacity in FE. + #Range: > 0 + generator_capacity = 5000 + #Alternator max input in FE (Energy transfer, not generation). + #Range: > 0 + generator_max_output = 5000 + +#Accumulator +[accumulator] + #Accumulator internal capacity per block in FE. + #Range: > 0 + accumulator_capacity = 2000000 + #Accumulator max output in FE/t (Energy transfer). + #Range: > 0 + accumulator_max_output = 5000 + #Accumulator max input in FE/t (Energy transfer). + #Range: > 0 + accumulator_max_input = 5000 + #Accumulator max multiblock height. + #Range: 1 ~ 8 + accumulator_max_height = 5 + #Accumulator max multiblock width. + #Range: 1 ~ 8 + accumulator_max_width = 3 + +#Rolling Mill +[rolling_mill] + #Rolling Mill duration in ticks. + #Range: > 0 + rolling_mill_processing_duration = 100 + #Rolling Mill base stress impact. + #Range: 0 ~ 1024 + rolling_mill_stress = 16 + +#Misc +[misc] + #Diamond Grit Sandpaper durability (number of uses). + #Range: > 3 + diamond_grit_sandpaper_uses = 1024 + #Barbed Wire Damage. + #Range: 0.0 ~ 3.4028234663852886E38 + barbed_wire_damage = 2.0 + diff --git a/config/jei/ingredient-list-mod-sort-order.ini b/config/jei/ingredient-list-mod-sort-order.ini index 0a40bb03b..83ed4b056 100644 --- a/config/jei/ingredient-list-mod-sort-order.ini +++ b/config/jei/ingredient-list-mod-sort-order.ini @@ -5,3 +5,5 @@ TerraFirmaCraft Extended Crafting Sophisticated Backpacks Sophisticated Core +Create Crafts & Additions +Create: Steam 'n' Rails diff --git a/config/jei/recipe-category-sort-order.ini b/config/jei/recipe-category-sort-order.ini index 2fdbdc28f..da1107788 100644 --- a/config/jei/recipe-category-sort-order.ini +++ b/config/jei/recipe-category-sort-order.ini @@ -121,3 +121,6 @@ extendedcrafting:elite_crafting extendedcrafting:ender_crafting extendedcrafting:flux_crafting extendedcrafting:ultimate_crafting +createaddition:charging +createaddition:liquid_burning +createaddition:rolling diff --git a/config/railways-client.toml b/config/railways-client.toml new file mode 100644 index 000000000..0b825d851 --- /dev/null +++ b/config/railways-client.toml @@ -0,0 +1,56 @@ + +#. +#Client-only settings - If you're looking for general settings, look inside your worlds serverconfig folder! +[client] + #. + #Disable the optifine warning screen [DANGER]: Using optifine With Steam 'n' Rails may cause issues and you will not get any support for optifine related issues. + disableOptifineNag = false + #. + #Show extended debug info in coupler goggle overlay + showExtendedCouplerDebug = false + #. + #Skip clientside train derailing. This prevents stuttering when a train places tracks, but trains will not appear derailed when they crash + skipClientDerailing = false + #. + #Use a scanline shader when spying through a conductor + useConductorSpyShader = true + #. + #Vertical offset for track overlays + #Range: -256.0 ~ 256.0 + trackOverlayOffset = 0.0 + #. + #Whether to actually apply the dev cape (ignored for non-devs) + #This setting may require a relog to take effect + useDevCape = true + + #. + #Smoke Settings + [client.smoke] + #. + #[in Ticks] + #Lifetime of smoke particles emitted by contraptions + #Range: 20 ~ 1000 + smokeLifetime = 500 + #. + #Smoke emission rate on contraptions + #Range: 0.0 ~ 10.0 + smokePercentage = 0.75 + #. + #Smoke texture quality + #Allowed Values: LOW, MEDIUM, HIGH, ULTRA + smokeQuality = "HIGH" + + #. + #Journeymap Settings + [client.journeymap] + #. + #[in Ticks] + #Journeymap train overlay update time + #Range: 1 ~ 600 + updateRate = 1 + #. + #[in Ticks] + #Journeymap train overlay old marker removal check time + #Range: 10 ~ 1200 + removeObsoleteRate = 200 + diff --git a/config/railways-common.toml b/config/railways-common.toml new file mode 100644 index 000000000..2845004a5 --- /dev/null +++ b/config/railways-common.toml @@ -0,0 +1,9 @@ +#. +#Register integration tracks for mods that are not present +#[@cui:RequiresReload:both] +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 + diff --git a/config/xaerominimap_entities.json b/config/xaerominimap_entities.json index c2360d359..f7ab2ff22 100644 --- a/config/xaerominimap_entities.json +++ b/config/xaerominimap_entities.json @@ -10,20 +10,20 @@ "name": "gui.xaero_entity_category_root", "protection": true, "settingOverrides": { - "displayHeight": 0.0, "displayed": true, + "displayHeight": 0.0, "heightBasedFade": true, "renderOrder": 0.0, "color": 13.0, "displayNameWhenIconFails": true, "entityNumber": 1000.0, "alwaysDisplayNametags": false, - "dotSize": 2.0, "startFadingAt": 0.0, + "dotSize": 2.0, "renderOverMinimapFrame": 1.0, "icons": 1.0, - "names": 0.0, "heightLimit": 20.0, + "names": 0.0, "iconScale": 1.0 }, "subCategories": [ diff --git a/kubejs/data/tfc/worldgen/configured_feature/vein/molybdenium.json b/kubejs/data/tfc/worldgen/configured_feature/vein/molybdenium.json index 24ac32b6e..00b25b82e 100644 --- a/kubejs/data/tfc/worldgen/configured_feature/vein/molybdenium.json +++ b/kubejs/data/tfc/worldgen/configured_feature/vein/molybdenium.json @@ -27,7 +27,7 @@ }, { "weight": 15, - "block": "gtceu:tfc_rhyolite_molybdenium_ore" + "block": "gtceu:tfc_rhyolite_molybdenum_ore" }, { "weight": 15, @@ -50,7 +50,7 @@ }, { "weight": 15, - "block": "gtceu:tfc_basalt_molybdenium_ore" + "block": "gtceu:tfc_basalt_molybdenum_ore" }, { "weight": 15, @@ -73,7 +73,7 @@ }, { "weight": 15, - "block": "gtceu:tfc_andesite_molybdenium_ore" + "block": "gtceu:tfc_andesite_molybdenum_ore" }, { "weight": 15, @@ -96,7 +96,7 @@ }, { "weight": 15, - "block": "gtceu:tfc_dacite_molybdenium_ore" + "block": "gtceu:tfc_dacite_molybdenum_ore" }, { "weight": 15, @@ -119,7 +119,7 @@ }, { "weight": 15, - "block": "gtceu:tfc_granite_molybdenium_ore" + "block": "gtceu:tfc_granite_molybdenum_ore" }, { "weight": 15, @@ -142,7 +142,7 @@ }, { "weight": 15, - "block": "gtceu:tfc_diorite_molybdenium_ore" + "block": "gtceu:tfc_diorite_molybdenum_ore" }, { "weight": 15, @@ -165,7 +165,7 @@ }, { "weight": 15, - "block": "gtceu:tfc_gabbro_molybdenium_ore" + "block": "gtceu:tfc_gabbro_molybdenum_ore" }, { "weight": 15, @@ -174,6 +174,6 @@ ] } ], - "random_name": "example" + "random_name": "molybdenium" } } \ No newline at end of file diff --git a/mods/ImmediatelyFast-1.2.6+1.20.2.jar b/mods/ImmediatelyFast-1.2.6+1.20.2.jard similarity index 100% rename from mods/ImmediatelyFast-1.2.6+1.20.2.jar rename to mods/ImmediatelyFast-1.2.6+1.20.2.jard diff --git a/mods/Steam_Rails-1.5.2+forge-mc1.20.1.jar b/mods/Steam_Rails-1.5.2+forge-mc1.20.1.jar new file mode 100644 index 000000000..d9a699001 Binary files /dev/null and b/mods/Steam_Rails-1.5.2+forge-mc1.20.1.jar differ diff --git a/mods/createaddition-1.20.1-1.1.1.jar b/mods/createaddition-1.20.1-1.1.1.jar new file mode 100644 index 000000000..22ef863c1 Binary files /dev/null and b/mods/createaddition-1.20.1-1.1.1.jar differ