remove duplicated bark entry

both/config/HungerOverhaul/HungerOverhaul.cfg

@@ -266,10 +266,10 @@ health {
     I:foodHealDivider=4
 
     # Eating food regenerates health [vanilla: false] [default: false]
-    B:foodRegensHealth=false
+    B:foodRegensHealth=true
 
     # Speed up or slow down the rate that health regenerates (0 to disable regen) [vanilla: 100] [range: 0 ~ 2147483647, default: 100]
-    I:healthRegenRatePercentage=100
+    I:healthRegenRatePercentage=120
 
     # The lower your health the longer it takes to regen, modify the effect here (lower = less effect) (modifyRegenRateOnLowHealth must be true) [vanilla: 5] [range: 0 ~ 2147483647, default: 5]
     I:lowHealthRegenRateModifier=5

both/config/aquaacrobatics.cfg

@@ -0,0 +1,126 @@
+# Configuration file
+
+general {
+    # STANDARD - The player will occasionally be pushed out of certain spaces. Collisions are evaluated for full cubes only, non-full cubes are ignored. This is the default behavior up to Minecraft 1.12.
+    # APPROXIMATE - The player can move into more spaces, but will still be pushed out of some. Collisions are evaluated for full cubes only, non-full cubes are ignored.
+    # EXACT - The player can move into all spaces as expected. Collisions are evaluated for all types of cubes. This is the default behavior in Minecraft 1.13 and onwards.
+    # Possible values: [STANDARD, APPROXIMATE, EXACT]
+    #  [default: APPROXIMATE]
+    S:"Push Player Out Of Blocks"=EXACT
+
+    ##########################################################################################################
+    # blocks
+    #--------------------------------------------------------------------------------------------------------#
+    # Block-related config options (must match server).
+    ##########################################################################################################
+
+    blocks {
+        # Make water only reduce light level by 1 per Y-level, instead of 3. [default: true]
+        B:"Brighter Water"=true
+
+        # Use the new water rendering in 1.13+. [default: false]
+        B:"New Water"=true
+
+        # Use the new fog rendering in 1.13+. [default: true]
+        B:"New Water Fog"=true
+
+        # Allow seagrass to generate in the world. [default: false]
+        B:Seagrass=true
+    }
+
+    ##########################################################################################################
+    # movement
+    #--------------------------------------------------------------------------------------------------------#
+    # Movement related config options.
+    ##########################################################################################################
+
+    movement {
+        # Taking off with an elytra from the ground is now far easier like in Minecraft 1.15 and onwards. [default: true]
+        B:"Easy Elytra Takeoff (Not working)"=true
+
+        # Enables crawling to prevent suffocation. Note that if you disable this there will probably be behavioral differences from 1.13. [default: true]
+        B:"Enable Crawling"=true
+
+        # Enables a keybind to toggle crawling. [default: true]
+        B:"Enable Toggle Crawling"=false
+
+        # Allow climbing vines and climbing by pressing jump. [default: false]
+        B:"New Climbing Behavior"=true
+
+        # Modify projectile behavior to be closer to that of newer versions (fixes MC-73884 and allows bubble columns to work with ender pearls). [default: false]
+        B:"New Projectile Behavior"=true
+
+        # Prevent sprinting from being triggered by double tapping the walk forward key. [default: false]
+        B:"No Double Tab Sprinting"=false
+
+        # Enables sprinting to the left and right. [default: false]
+        B:"Sideways Sprinting"=false
+
+        # Enables swimming to the left and right. [default: false]
+        B:"Sideways Swimming"=false
+    }
+
+    ##########################################################################################################
+    # miscellaneous
+    #--------------------------------------------------------------------------------------------------------#
+    # Config options for various features of the mod.
+    ##########################################################################################################
+
+    miscellaneous {
+        # Change the Boat datawatchers ID. [range: -2147483648 ~ 2147483647, default: 29]
+        I:"Boat ID"=29
+
+        # Enable bubble columns. [default: false]
+        B:"Bubble Columns"=false
+
+        # Change the Crawling datawatchers ID. [range: -2147483648 ~ 2147483647, default: 31]
+        I:"Crawling ID"=31
+
+        # Allows overriding the water and fog colors for a biome. Specify each entry like this (without quotes) - 'modname:biome,color,fogcolor' [default: ]
+        S:"Custom Biome Water Colors" <
+         >
+
+        # Animate eating in third-person view. [default: true]
+        B:"Eating Animation"=true
+
+        # Whether or not items should float in water like in 1.13+. [default: true]
+        B:"Floating Items"=true
+
+        # Change the pose datawatchers ID. [range: -2147483648 ~ 2147483647, default: 30]
+        I:"Pose ID"=30
+
+        # Replenish air slowly when out of water instead of immediately. [default: false]
+        B:"Replenish Air Slowly"=true
+
+        # Parrots no longer leave the players shoulders as easily, instead the player needs to press the sneak key. [default: false]
+        B:"Sneaking Dismounts Parrots"=true
+
+        # List of WorldProviders in which fog should be disabled. [default: [thebetweenlands.common.world.WorldProviderBetweenlands]]
+        S:"WorldProvider Fog Blacklist" <
+            thebetweenlands.common.world.WorldProviderBetweenlands
+         >
+    }
+
+    ##########################################################################################################
+    # integration
+    #--------------------------------------------------------------------------------------------------------#
+    # Control compatibility settings for individual mods.
+    ##########################################################################################################
+
+    integration {
+        #  [default: true]
+        B:"Applied Energistics 2 Integration"=true
+
+        #  [default: true]
+        B:"EFR Integration"=true
+
+        #  [default: true]
+        B:"Hats Integration"=true
+
+        #  [default: true]
+        B:"Morph Integration"=true
+    }
+
+}
+
+

both/config/archaicfix.cfg

@@ -92,7 +92,7 @@ general {
     B:itemLagReduction=false
 
     # Log when cascading worldgen occurs. [default: true]
-    B:logCascadingWorldgen=true
+    B:logCascadingWorldgen=false
 
     # Print a stacktrace when cascading worldgen occurs. Use only for development as this will add more lag in game. [default: false]
     B:logCascadingWorldgenStacktrace=false

both/config/etfuturum/mixins.cfg

@@ -54,7 +54,7 @@
     B:enableObservers=true
 
     # You nappa, you get slappa [default: true]
-    B:enablePlayersSleepingPecentageGamerule=true
+    B:enablePlayersSleepingPecentageGamerule=false
 
     # Add the randomTickSpeed game rule from 1.8+ [default: true]
     B:enableRandomTickSpeed=true

both/config/microblocks.cfg

@@ -19,9 +19,14 @@
 "etfuturum:smooth_quartz"
 "etfuturum:quartz_bricks"
 "etfuturum:concrete":0-15
-"etfuturum:bark":0-3
 "etfuturum:plankWood":0-4
 "etfuturum:azalea_leaves":0-1
+"etfuturum:log_stripped":0-3
+"etfuturum:log2_stripped":0-1
+"etfuturum:wood_stripped":0-3
+"etfuturum:wood2_stripped":0-1
+"etfuturum:bark":0-3
+"etfuturum:bark2":0-1
 
 # Underground Biomes
 "UndergroundBiomes:igneousStone":0-7
@@ -105,6 +110,7 @@
 # MINECRAFT
 "minecraft:double_stone_slab":0,8
 "minecraft:hay_block"
+"minecraft:log2":1
 
 # NATURA
 "Natura:soil.tainted":0-2

client/config/txloader/config.json

@@ -35,6 +35,12 @@
         "source": "CLIENT",
         "version": "1.20.6"
     },
+    {
+        "resourceLocation": "minecraft/textures/block/acacia_planks.png",
+        "resourceLocationOverride": "minecraft/textures/blocks/planks_acacia.png",
+        "source": "CLIENT",
+        "version": "1.20.6"
+    },
     {
         "resourceLocation": "minecraft/textures/block/cherry_planks.png",
         "resourceLocationOverride": "minecraft/textures/blocks/cherry_planks.png",

client/config/txloader/forceload/bigreactors/textures/blocks/tile.blockReactorPart.controller.active.png.mcmeta

@@ -0,0 +1,51 @@
+{
+  "animation": {
+  "interpolate": false,
+  	"frames": [
+  		{
+  			"index": 0,
+  			"time": 12
+  		},
+  		{
+  			"index": 1,
+  			"time": 12
+  		},
+  		{
+  			"index": 2,
+  			"time": 12
+  		},
+  		{
+  			"index": 3,
+  			"time": 12
+  		},
+  		{
+  			"index": 4,
+  			"time": 12
+  		},
+  		{
+  			"index": 5,
+  			"time": 12
+  		},
+  		{
+  			"index": 6,
+  			"time": 12
+  		},
+  		{
+  			"index": 7,
+  			"time": 12
+  		},
+  		{
+  			"index": 8,
+  			"time": 12
+  		},
+  		{
+  			"index": 9,
+  			"time": 12
+  		},
+  		{
+  			"index": 10,
+  			"time": 12
+  		}
+  	]
+  }  
+}

client/config/txloader/forceload/bigreactors/textures/blocks/tile.blockReactorPart.controller.idle.png.mcmeta

@@ -0,0 +1,15 @@
+{
+  "animation": {
+  "interpolate": false,
+  	"frames": [
+  		{
+  			"index": 0,
+  			"time": 4
+  		},
+  		{
+  			"index": 1,
+  			"time": 12
+  		}
+  	]
+  }  
+}

client/config/txloader/forceload/bigreactors/textures/blocks/tile.blockReactorPart.controllerActive.png.mcmeta

@@ -0,0 +1,51 @@
+{
+  "animation": {
+  "interpolate": false,
+  	"frames": [
+  		{
+  			"index": 0,
+  			"time": 12
+  		},
+  		{
+  			"index": 1,
+  			"time": 12
+  		},
+  		{
+  			"index": 2,
+  			"time": 12
+  		},
+  		{
+  			"index": 3,
+  			"time": 12
+  		},
+  		{
+  			"index": 4,
+  			"time": 12
+  		},
+  		{
+  			"index": 5,
+  			"time": 12
+  		},
+  		{
+  			"index": 6,
+  			"time": 12
+  		},
+  		{
+  			"index": 7,
+  			"time": 12
+  		},
+  		{
+  			"index": 8,
+  			"time": 12
+  		},
+  		{
+  			"index": 9,
+  			"time": 12
+  		},
+  		{
+  			"index": 10,
+  			"time": 12
+  		}
+  	]
+  }  
+}

client/config/txloader/forceload/bigreactors/textures/blocks/tile.blockReactorPart.controllerIdle.png.mcmeta

@@ -0,0 +1,15 @@
+{
+  "animation": {
+  "interpolate": false,
+  	"frames": [
+  		{
+  			"index": 0,
+  			"time": 4
+  		},
+  		{
+  			"index": 1,
+  			"time": 12
+  		}
+  	]
+  }  
+}

client/config/txloader/forceload/bigreactors/textures/blocks/tile.blockTurbinePart.controller.active.png.mcmeta

@@ -0,0 +1,51 @@
+{
+  "animation": {
+  "interpolate": false,
+  	"frames": [
+  		{
+  			"index": 0,
+  			"time": 12
+  		},
+  		{
+  			"index": 1,
+  			"time": 12
+  		},
+  		{
+  			"index": 2,
+  			"time": 12
+  		},
+  		{
+  			"index": 3,
+  			"time": 12
+  		},
+  		{
+  			"index": 4,
+  			"time": 12
+  		},
+  		{
+  			"index": 5,
+  			"time": 12
+  		},
+  		{
+  			"index": 6,
+  			"time": 12
+  		},
+  		{
+  			"index": 7,
+  			"time": 12
+  		},
+  		{
+  			"index": 8,
+  			"time": 12
+  		},
+  		{
+  			"index": 9,
+  			"time": 12
+  		},
+  		{
+  			"index": 10,
+  			"time": 12
+  		}
+  	]
+  }  
+}

client/config/txloader/forceload/bigreactors/textures/blocks/tile.blockTurbinePart.controller.idle.png.mcmeta

@@ -0,0 +1,15 @@
+{
+  "animation": {
+  "interpolate": false,
+  	"frames": [
+  		{
+  			"index": 0,
+  			"time": 4
+  		},
+  		{
+  			"index": 1,
+  			"time": 12
+  		}
+  	]
+  }  
+}

server/config/Morpheus.cfg

@@ -0,0 +1,18 @@
+# Configuration file
+
+groundlevel {
+    # Ground Level (1-255) [range: 1 ~ 255, default: 64]
+    I:settings=64
+}
+
+
+settings {
+    B:AlertEnabled=true
+    B:IncludeMiners=false
+    S:OnMorningText=Diese Nacht wurde durchgeschlafen!
+    S:OnSleepText=möchte schlafen.
+    S:OnWakeText=hat das Bett verlassen.
+    I:SleeperPerc=50
+}
+
+