Merge pull request #74 from Irgendwer01/master

1.9

Author: Irgendwer01

config/AppliedEnergistics2/AppliedEnergistics2.cfg

@@ -15,9 +15,107 @@ battery {
 }
 
 
+##########################################################################################################
+# blockingmode
+#--------------------------------------------------------------------------------------------------------#
+# Map of items to not block when blockingmode is enabled.
+# [modid]
+# modid:item:metadata(optional,default:0)
+# Supports more than one modid, so you can block different things between, for example, gregtech or enderio
+##########################################################################################################
+
+blockingmode {
+    # NonBlockingItems
+    S:nonBlockingItems <
+        [gregtech|actuallyadditions]
+        gregtech:circuit.integrated
+        gregtech:shape.mold.plate
+        gregtech:shape.mold.gear
+        gregtech:shape.mold.credit
+        gregtech:shape.mold.bottle
+        gregtech:shape.mold.ingot
+        gregtech:shape.mold.ball
+        gregtech:shape.mold.block
+        gregtech:shape.mold.nugget
+        gregtech:shape.mold.cylinder
+        gregtech:shape.mold.anvil
+        gregtech:shape.mold.name
+        gregtech:shape.mold.gear.small
+        gregtech:shape.mold.rotor
+        gregtech:shape.extruder.plate
+        gregtech:shape.extruder.rod
+        gregtech:shape.extruder.bolt
+        gregtech:shape.extruder.ring
+        gregtech:shape.extruder.cell
+        gregtech:shape.extruder.ingot
+        gregtech:shape.extruder.wire
+        gregtech:shape.extruder.pipe.tiny
+        gregtech:shape.extruder.pipe.small
+        gregtech:shape.extruder.pipe.medium
+        gregtech:shape.extruder.pipe.normal
+        gregtech:shape.extruder.pipe.large
+        gregtech:shape.extruder.pipe.huge
+        gregtech:shape.extruder.block
+        gregtech:shape.extruder.sword
+        gregtech:shape.extruder.pickaxe
+        gregtech:shape.extruder.shovel
+        gregtech:shape.extruder.axe
+        gregtech:shape.extruder.hoe
+        gregtech:shape.extruder.hammer
+        gregtech:shape.extruder.file
+        gregtech:shape.extruder.saw
+        gregtech:shape.extruder.gear
+        gregtech:shape.extruder.bottle
+        gregtech:shape.extruder.foil
+        gregtech:shape.extruder.gear_small
+        gregtech:shape.extruder.rod_long
+        gregtech:shape.extruder.rotor
+        gregtech:glass_lens.white
+        gregtech:glass_lens.orange
+        gregtech:glass_lens.magenta
+        gregtech:glass_lens.light_blue
+        gregtech:glass_lens.yellow
+        gregtech:glass_lens.lime
+        gregtech:glass_lens.pink
+        gregtech:glass_lens.gray
+        gregtech:glass_lens.light_gray
+        gregtech:glass_lens.cyan
+        gregtech:glass_lens.purple
+        gregtech:glass_lens.blue
+        gregtech:glass_lens.brown
+        gregtech:glass_lens.green
+        gregtech:glass_lens.red
+        gregtech:glass_lens.black
+        contenttweaker:smallgearextrudershape
+        contenttweaker:creativeportabletankmold
+        ore:lensAlmandine
+        ore:lensBlueTopaz
+        ore:lensDiamond
+        ore:lensEmerald
+        ore:lensGreenSapphire
+        ore:lensRutile
+        ore:lensRuby
+        ore:lensSapphire
+        ore:lensTopaz
+        ore:lensJasper
+        ore:lensGlass
+        ore:lensOlivine
+        ore:lensOpal
+        ore:lensAmethyst
+        ore:lensLapis
+        ore:lensEnderPearl
+        ore:lensEnderEye
+        ore:lensGarnetRed
+        ore:lensGarnetYellow
+        ore:lensVinteum
+        ore:lensNetherStar
+     >
+}
+
+
 client {
-    # Possible Values: AE, EU, RF
-    S:PowerUnit=AE
+    # Possible Values: AE, EU, RF, GTEU
+    S:PowerUnit=GTEU
 
     # Possible Values: AUTOSEARCH, AUTOSEARCH_KEEP, MANUAL_SEARCH, MANUAL_SEARCH_KEEP, JEI_AUTOSEARCH, JEI_AUTOSEARCH_KEEP, JEI_MANUAL_SEARCH, JEI_MANUAL_SEARCH_KEEP
     S:SEARCH_MODE=AUTOSEARCH
@@ -206,6 +304,7 @@ features {
         B:P2PTunnelEU=true
         B:P2PTunnelFE=true
         B:P2PTunnelFluids=true
+        B:P2PTunnelGTEU=true
         B:P2PTunnelItems=true
         B:P2PTunnelLight=true
         B:P2PTunnelME=true
@@ -254,8 +353,6 @@ features {
 
     craftingfeatures {
         B:CraftingCPU=true
-
-        # Use CraftingManager to find an alternative recipe, after a pattern rejected an ingredient. Should be enabled to avoid issues, but can have a minor performance impact.
         B:CraftingManagerFallback=true
         B:MolecularAssembler=true
         B:Patterns=true
@@ -352,6 +449,7 @@ grindstone {
 
 modintegration {
     S:CraftTweaker=AUTO
+    S:GregTech=AUTO
     S:IndustrialCraft2=AUTO
     S:InventoryTweaks=AUTO
     S:JustEnoughItems=AUTO
@@ -367,6 +465,7 @@ modintegration {
 
 powerratios {
     D:ForgeEnergy=0.5
+    D:GTEU=2.0
     D:IC2=2.0
     D:UsageMultiplier=1.0
 }

config/AppliedEnergistics2/VersionChecker.cfg

@@ -3,7 +3,7 @@
 cache {
     # Waits as many hours, until it checks again. [range: 0 ~ 168, default: 24]
     I:interval=24
-    S:lastCheck=1641643516941
+    S:lastCheck=1649093345063
 }
 
 

config/betterquesting.cfg

@@ -1,13 +1,8 @@
 # Configuration file
 
 general {
-    # If true, then when you click on Claim all, a warning dialog will be displayed [default: true]
     B:"Claim all requires confirmation"=true
-
-    # The default visibility value used when creating quests [default: NORMAL]
     S:"Default Quest Visibility"=NORMAL
-
-    # If true, locks the quest chapter list and opens it initially [default: false]
     B:"Lock Tray"=false
 
     # Clamps the max UI height (-1 to disable) [range: -1 ~ 2147483647, default: -1]
@@ -18,26 +13,16 @@ general {
 
     # Enabled the popup notices when quests are completed or updated [default: true]
     B:"Quest Notices"=true
-
-    # Increases or decreases the scrolling speed [range: 0.0 ~ 10.0, default: 1.0]
     S:"Scroll Speed Multiplier"=1.0
 
     # The current questing theme [default: betterquesting:light]
-    S:Theme=betterquesting:light
+    S:Theme=bq_standard:dark
 
     # Jumps the user to the last opened quest [default: true]
     B:"Use Quest Bookmark"=true
-
-    # Zoom in on cursor. If false, zooms in on center of screen. [default: true]
     B:"Zoom In on Cursor"=true
-
-    # Zoom out on cursor. If false, zooms out on center of screen. [default: true]
     B:"Zoom Out on Cursor"=true
-
-    # Zoom smoothness in ms [range: 0.0 ~ 2000.0, default: 100.0]
     S:"Zoom Smoothness"=100.0
-
-    # Zoom Speed [range: 1.05 ~ 3.0, default: 1.25]
     S:"Zoom Speed"=1.25
 }