diff --git a/.gitignore b/.gitignore index 38c9735d9..43a31fe38 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,7 @@ XaeroWorldMap/* CustomSkinLoader/* screenshots/* shaderpacks/* +chiselsandbits/* # Extensions **/*.log @@ -62,5 +63,4 @@ knownkeys.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/whitelist.json \ No newline at end of file diff --git a/config/exposure-common.toml b/config/exposure-common.toml index 47b44b60e..f619bc6de 100644 --- a/config/exposure-common.toml +++ b/config/exposure-common.toml @@ -3,6 +3,7 @@ #Default focal range of the camera (with built in lens). Default: 18-55 DefaultFocalRange = "18-55" #Focal Range per lens. Item ID and min-max (or single number for primes) focal lengths. Separated by a comma. Allowed range: 10-300 + #Note: to attach the custom lens to the camera - it needs to be added to '#exposure:lenses' item tag. #Default: ["minecraft:spyglass,55-200"] LensFocalRanges = ["minecraft:spyglass,55-200"] diff --git a/config/terrafirmagreg.json b/config/tfg.json similarity index 100% rename from config/terrafirmagreg.json rename to config/tfg.json diff --git a/kubejs/assets/terrafirmagreg/textures/block/copper_coil_block.png b/kubejs/assets/terrafirmagreg/textures/block/copper_coil_block.png deleted file mode 100644 index e4edb9e4b..000000000 Binary files a/kubejs/assets/terrafirmagreg/textures/block/copper_coil_block.png and /dev/null differ diff --git a/kubejs/assets/terrafirmagreg/textures/block/copper_coil_block.png.mcmeta b/kubejs/assets/terrafirmagreg/textures/block/copper_coil_block.png.mcmeta deleted file mode 100644 index fc2ebfe89..000000000 --- a/kubejs/assets/terrafirmagreg/textures/block/copper_coil_block.png.mcmeta +++ /dev/null @@ -1,5 +0,0 @@ -{ - "ldlib": { - "connection": "terrafirmagreg:block/copper_coil_block_ctm" - } -} diff --git a/kubejs/assets/terrafirmagreg/textures/block/copper_coil_block_bloom.png b/kubejs/assets/terrafirmagreg/textures/block/copper_coil_block_bloom.png deleted file mode 100644 index 07177b317..000000000 Binary files a/kubejs/assets/terrafirmagreg/textures/block/copper_coil_block_bloom.png and /dev/null differ diff --git a/kubejs/assets/terrafirmagreg/textures/block/copper_coil_block_bloom.png.mcmeta b/kubejs/assets/terrafirmagreg/textures/block/copper_coil_block_bloom.png.mcmeta deleted file mode 100644 index df6100a46..000000000 --- a/kubejs/assets/terrafirmagreg/textures/block/copper_coil_block_bloom.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "ldlib": { - "connection": "terrafirmagreg:block/copper_coil_block_bloom_ctm", - "emissive": true - } -} \ No newline at end of file diff --git a/kubejs/assets/terrafirmagreg/textures/block/copper_coil_block_bloom_ctm.png b/kubejs/assets/terrafirmagreg/textures/block/copper_coil_block_bloom_ctm.png deleted file mode 100644 index b58e4f54a..000000000 Binary files a/kubejs/assets/terrafirmagreg/textures/block/copper_coil_block_bloom_ctm.png and /dev/null differ diff --git a/kubejs/assets/terrafirmagreg/textures/block/copper_coil_block_ctm.png b/kubejs/assets/terrafirmagreg/textures/block/copper_coil_block_ctm.png deleted file mode 100644 index 74e65ef6e..000000000 Binary files a/kubejs/assets/terrafirmagreg/textures/block/copper_coil_block_ctm.png and /dev/null differ diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index 723e5c8d0..b3d864a9a 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -1006,14 +1006,6 @@ const registerGTCEURecipes = (event) => { E: '#forge:cables/single/copper' }).id('tfg:shaped/alternator') - // Медная катушка - event.recipes.gtceu.assembler('copper_coil') - .itemInputs('8x #forge:wires/double/copper', '8x #forge:foils/bronze') - .inputFluids(Fluid.of('gtceu:soldering_alloy', 144)) - .itemOutputs('terrafirmagreg:copper_coil_block') - .duration(200) - .EUt(30) - // Compressed Coke Clay event.shaped('gtceu:compressed_coke_clay', [ 'AAA', diff --git a/kubejs/startup_scripts/gtceu/blocks.js b/kubejs/startup_scripts/gtceu/blocks.js index 35624b24d..d389a83f2 100644 --- a/kubejs/startup_scripts/gtceu/blocks.js +++ b/kubejs/startup_scripts/gtceu/blocks.js @@ -1,16 +1,5 @@ // priority: 0 const registerGTCEuBlocks = (event) => { - event.create('terrafirmagreg:copper_coil_block', 'gtceu:coil') - .temperature(1100) - .level(0) - .energyDiscount(1) - .tier(0) - .coilMaterial(GTMaterials.get('copper')) - .texture('terrafirmagreg:block/copper_coil_block') - .hardness(4) - .requiresTool(true) - .tagBlock('mineable/pickaxe') - .mapColor('metal') - .soundType('metal') + } \ No newline at end of file diff --git a/kubejs/startup_scripts/gtceu/machines.js b/kubejs/startup_scripts/gtceu/machines.js index 1209e5558..0a415b613 100644 --- a/kubejs/startup_scripts/gtceu/machines.js +++ b/kubejs/startup_scripts/gtceu/machines.js @@ -32,7 +32,7 @@ const registerGTCEuMachines = (event) => { .aisle("CWC", "K#E", "CWC") .aisle("CWI", "CWA", "#W#") .where('A', Predicates.controller(Predicates.blocks(definition.get()))) - .where('W', Predicates.blocks('terrafirmagreg:copper_coil_block')) + .where('W', Predicates.blocks('gtceu:cupronickel_coil_block')) .where("C", Predicates.blocks(GTBlocks.CASING_STEEL_SOLID.get())) .where('#', Predicates.any()) .where('K', Predicates.abilities(PartAbility.INPUT_KINETIC).setExactLimit(1))