Skip to content

Commit

Permalink
misc for last commit
Browse files Browse the repository at this point in the history
  • Loading branch information
mczph committed Jun 1, 2023
1 parent d5a4372 commit a7e32e7
Show file tree
Hide file tree
Showing 6 changed files with 60 additions and 56 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -116,13 +116,12 @@
"nyx_rod": 171,
"u_u_matter_rod": 85,
"u_u_matter_ingot": 82,
"gallium_block": 226,
"command_nugget": 182,
"duraluminium_wire": 135,
"duplication_plate": 90,
"magnet_rod": 222,
"iridium_wire": 200,
"u_u_matter_plate": 83,
"duraluminium_coil": 133,
"naturium_nugget": 131,
"gallium_rod": 204,
"menril_block": 136,
Expand All @@ -145,6 +144,7 @@
"heavymetalelements_gear": 55,
"six_in_one_thaumic_ingot": 193,
"energium_dust": 81,
"advanced_electronic_alloy_coil": 225,
"menril_ingot": 137,
"advanced_electronic_alloy_wire": 217
}
Expand Down
1 change: 1 addition & 0 deletions config/acronym/saved/material_parts_contenttweaker.json
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@
"nyx_rod": 171,
"u_u_matter_rod": 85,
"u_u_matter_ingot": 82,
"gallium_block": 226,
"command_nugget": 182,
"duplication_plate": 90,
"magnet_rod": 222,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"3": "semiconductor_block",
"4": "heavymetalelements_block",
"5": "superconduct_block",
"6": "duraluminium_coil",
"6": "advanced_electronic_alloy_coil",
"7": "six_in_one_thaumic_block",
"8": "europium_block",
"9": "crude_gold_ore",
Expand All @@ -27,7 +27,8 @@
"5": "advanced_electronic_alloy_block",
"6": "gaia_coil",
"7": "nyx_ore",
"8": "nyx_block"
"8": "nyx_block",
"9": "gallium_block"
}
}
}
3 changes: 2 additions & 1 deletion config/acronym/saved/saved_sub_blocks_contenttweaker.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@
"5": "advanced_electronic_alloy_block",
"6": "gaia_coil",
"7": "nyx_ore",
"8": "nyx_block"
"8": "nyx_block",
"9": "gallium_block"
}
}
}
102 changes: 51 additions & 51 deletions options.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ mouseSensitivity:0.5
fov:0.0
gamma:1.0
saturation:0.0
renderDistance:2
renderDistance:8
guiScale:0
particles:2
bobView:true
Expand All @@ -26,7 +26,7 @@ chatLinksPrompt:true
chatOpacity:1.0
snooperEnabled:false
fullscreen:false
enableVsync:false
enableVsync:true
useVbo:true
hideServerAddress:false
advancedItemTooltips:false
Expand Down Expand Up @@ -74,7 +74,7 @@ key_key.fullscreen:87
key_key.spectatorOutlines:0
key_key.swapHands:33
key_key.saveToolbarActivator:0
key_key.loadToolbarActivator:45
key_key.loadToolbarActivator:0
key_key.advancements:0
key_key.hotbar.1:2
key_key.hotbar.2:3
Expand All @@ -86,11 +86,11 @@ key_key.hotbar.7:8
key_key.hotbar.8:9
key_key.hotbar.9:10
key_of.key.zoom:46
key_Change Caster Focus:33
key_Misc Caster Toggle:34
key_Change Caster Focus:0
key_Misc Caster Toggle:0
key_key.groovyscript.reload:19:CONTROL
key_Reload Menu | CTRL + ALT + :0
key_Toggle Customization Overlay | CTRL + ALT + :52
key_Toggle Customization Overlay | CTRL + ALT + :0
key_keybind.baublesinventory:48
key_psimisc.keybind:0
key_rpsideas.kb.offhandcast:0
Expand All @@ -108,25 +108,25 @@ key_rpsideas.kb.switchslot11:0
key_rpsideas.kb.switchslot12:0
key_key.xu2.searchforitems:0
key_bloodmagic.keybind.open_holding:0
key_bloodmagic.keybind.cycle_holding_pos:13:SHIFT
key_bloodmagic.keybind.cycle_holding_neg:12:SHIFT
key_bloodmagic.keybind.cycle_holding_pos:0
key_bloodmagic.keybind.cycle_holding_neg:0
key_arcanearchives.gui.keybinds.manifest:0
key_arcanearchives.gui.keybinds.socket:0
key_key.conarm.toggle_helm.desc:34
key_key.conarm.toggle_chest.desc:35
key_key.conarm.toggle_leg.desc:36
key_key.conarm.toggle_helm.desc:0
key_key.conarm.toggle_chest.desc:0
key_key.conarm.toggle_leg.desc:0
key_keybind.hammercorerenderstack:77
key_ChatFlow:88
key_key.toggleFoVChanges:0
key_key.reloadSoundSystem:0
key_key.toggleTimeOfDayOverlay:0
key_key.togglePotionParticles:0
key_cos.key.opencosarmorinventory:0
key_key.custommodel.selectmodel:50:CONTROL
key_key.custommodel.selectmodel:0
key_key.findme.search:21
key_key.ftbutilities.nbt:49:ALT
key_key.ftbutilities.nbt:0
key_key.ftbutilities.trash:211
key_key.ftbquests.quests:0
key_key.ftbquests.quests:38
key_ingameinfoxml.key.toggle:0
key_key.moreoverlays.lightoverlay.desc:65
key_key.moreoverlays.chunkbounds.desc:67
Expand All @@ -140,17 +140,17 @@ key_key.openNotes:49
key_oreexcavation.key.excavate:41
key_oreexcavation.key.shape:47
key_Toggle Raw Input:0
key_Rescan Key:43
key_schematica.key.load:181
key_schematica.key.save:55
key_schematica.key.control:74
key_Rescan Key:40
key_schematica.key.load:0
key_schematica.key.save:0
key_schematica.key.control:0
key_schematica.key.layerInc:0
key_schematica.key.layerDec:0
key_schematica.key.layerToggle:0
key_schematica.key.renderToggle:0
key_schematica.key.printerToggle:0
key_schematica.key.moveHere:0
key_schematica.key.pickBlock:-98:SHIFT
key_schematica.key.pickBlock:0
key_key.enableView:0
key_key.openShulker:0
key_key.toggleView:0
Expand All @@ -160,9 +160,9 @@ key_key.dismount:42
key_key.narrator:0
key_smoothfont.key.guiOpen:199
key_key.clipboardPaste:210
key_key.cofh.multimode:47
key_key.jei.toggleOverlay:24:CONTROL
key_key.jei.focusSearch:33:CONTROL
key_key.cofh.multimode:0
key_key.jei.toggleOverlay:0
key_key.jei.focusSearch:0
key_key.jei.toggleCheatMode:0
key_key.jei.toggleEditMode:0
key_key.jei.showRecipe:19
Expand All @@ -183,7 +183,7 @@ key_key.draconicevolution.cycleAttackAOE:0
key_key.draconicevolution.toggleShields:0
key_tombstone.message.knowledge_of_death:0
key_nei.options.keys.gui.botania_corporea_request:0
key_key.toggleLiquids:38
key_key.toggleLiquids:0
key_key.toggleVisible:0
key_key.immersiveengineering.magnetEquip:0
key_key.immersiveengineering.chemthrowerSwitch:0
Expand All @@ -192,9 +192,9 @@ key_key.open_wireless_terminal.desc:20:SHIFT
key_key.open_wireless_crafting_terminal.desc:18:SHIFT
key_key.open_wireless_pattern_terminal.desc:19:SHIFT
key_key.open_wireless_fluid_terminal.desc:33:SHIFT
key_mekanism.key.mode:50
key_mekanism.key.armorMode:34
key_mekanism.key.feetMode:35
key_mekanism.key.mode:0
key_mekanism.key.armorMode:0
key_mekanism.key.feetMode:0
key_mekanism.key.voice:0
key_key.aether.accessory_menu:0
key_key.aquaacrobatics.toggle_crawling:0
Expand Down Expand Up @@ -229,10 +229,10 @@ key_key.craftingtweaks.refill_last_stack:15
key_key.overload:0
key_key.chaosInjection:0
key_keys.techreborn.config:0
key_key.integrateddynamics.logic_programmer_focus_search:33:ALT
key_key.integrateddynamics.logic_programmer_open_rename:19:ALT
key_FpsReducer.key.guiOpen:207
key_FpsReducer.key.forceIdle:197
key_key.integrateddynamics.logic_programmer_focus_search:0
key_key.integrateddynamics.logic_programmer_open_rename:0
key_FpsReducer.key.guiOpen:0
key_FpsReducer.key.forceIdle:0
key_key.itemzoom.toggle:44:SHIFT
key_key.itemzoom.hold:0
key_key.itemzoom.zoom.in:0
Expand All @@ -258,18 +258,18 @@ key_key.music_player_gui:0
key_key.music_player_toggle:0
key_key.music_player_next:0
key_key.music_player_previous:0
key_keybind.simplyjetpacks.gui:44
key_keybind.simplyjetpacks.engine:34
key_keybind.simplyjetpacks.charger:25
key_keybind.simplyjetpacks.hover:38
key_keybind.simplyjetpacks.gui:0
key_keybind.simplyjetpacks.engine:0
key_keybind.simplyjetpacks.charger:0
key_keybind.simplyjetpacks.hover:0
key_keybind.simplyjetpacks.emergency_hover:0
key_key.plustic_release_entity.desc:11
key_key.plustic_toggle_gui.desc:23
key_key.plustic_set_portal.desc:49
key_key.plustic_toggle_gui.desc:0
key_key.plustic_set_portal.desc:0
key_key.plustic_brown_magic.desc:24
key_key.plustic_toggle_tool.desc:51:ALT
key_key.plustic_fruit_salad.desc:12:ALT
key_key.plustic_mots.desc:13:ALT
key_key.plustic_toggle_tool.desc:0
key_key.plustic_fruit_salad.desc:0
key_key.plustic_mots.desc:0
key_key.musictriggers.gui:0
key_key.neenergistics.ingredient.switch:42
key_key.neenergistics.stack.count.change:29
Expand All @@ -278,8 +278,8 @@ key_key.neenergistics.crafting.helper.noPreview:56
key_pi.key.open_pi:0
key_pi.key.et_gui:0
key_pi.key.et_world:0
key_key.quit.fastQuit:16
key_key.quit.bossKey:48
key_key.quit.fastQuit:0
key_key.quit.bossKey:0
key_key.porterNextDestination:27
key_key.porterPrevDestination:26
key_key.debugDumpNBTItem:0
Expand Down Expand Up @@ -309,17 +309,17 @@ key_gui.xaero_toggle_manual_cave_mode:0
key_gui.xaero_alternative_list_players:0
key_gui.xaero_minimap_settings:21
key_gui.xaero_open_map:50
key_gui.xaero_open_settings:27
key_gui.xaero_map_zoom_in:0
key_gui.xaero_map_zoom_out:0
key_gui.xaero_open_settings:45
key_gui.xaero_map_zoom_in:13
key_gui.xaero_map_zoom_out:12
key_gui.xaero_quick_confirm:54
key_开关喷气背包:45
key_开关喷气背包:0
key_打开火箭界面:0
key_切换 RCS:19
key_向右旋转载具:32
key_向左旋转载具:30
key_向上移动载具:44
key_向下移动载具:45
key_切换 RCS:0
key_向右旋转载具:0
key_向左旋转载具:0
key_向上移动载具:0
key_向下移动载具:0
key_key.sort_config:37
key_key.sort:-98
key_key.control:0
Expand All @@ -334,7 +334,7 @@ key_enderio.keybind.speed:0
key_enderio.keybind.jump:0
key_enderio.keybind.top:0
key_enderio.keybind.tnt:0
key_enderio.keybind.yetawrenchmode:21
key_enderio.keybind.yetawrenchmode:0
key_enderio.keybind.magnet:0
key_enderio.keybind.fovreset:0
key_enderio.keybind.fovunreset:0
Expand Down
1 change: 1 addition & 0 deletions scripts/recipes/mods/IE.zs
Original file line number Diff line number Diff line change
Expand Up @@ -255,3 +255,4 @@ Blueprint.addRecipe("Coil", <contenttweaker:sub_block_holder_1>, [<ore:wireMenri
Blueprint.addRecipe("Coil", <contenttweaker:sub_block_holder_1:2>, [<ore:wireNaturium>*8,<ore:itemRubber>*6]);
Blueprint.addRecipe("Coil", <contenttweaker:sub_block_holder_1:4>, [<ore:wireTwilghtSteel>*8,<ore:itemRubber>*6]);
Blueprint.addRecipe("Coil", <contenttweaker:sub_block_holder_1:6>, [<ore:wireGaia>*8,<ore:itemRubber>*6]);
recipes.addShapeless(<immersiveengineering:blueprint>.withTag({blueprint: "Coil"}),[<ore:circuitGood>,<ore:wireElectrum>,<ore:wireAluminum>,<ore:wireCopper>]);

0 comments on commit a7e32e7

Please sign in to comment.