Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev

defaultconfigs/ftbranks/ranks.snbt

@@ -5,7 +5,7 @@
 		condition: "always_active"
 		ftbranks.name_format: "&a{name}"
 		ftbchunks.max_claimed: 50
-		ftbchunks.max_force_loaded: 3
+		ftbchunks.max_force_loaded: 8
 		ftbchunks.chunk_load_offline: false
 		command.trashcan: true
 		command.enderchest: false
@@ -15,7 +15,7 @@
 		power: 50
 		ftbranks.name_format: "&e{name}"
 		ftbchunks.max_claimed: 200
-		ftbchunks.max_force_loaded: 5
+		ftbchunks.max_force_loaded: 10
 		ftbchunks.chunk_load_offline: true
 	}
 	moderator_girl: {
@@ -23,14 +23,14 @@
 		power: 51
 		ftbranks.name_format: "&d{name}"
 		ftbchunks.max_claimed: 200
-		ftbchunks.max_force_loaded: 5
+		ftbchunks.max_force_loaded: 10
 	}
 	moderator: {
 		name: "Moderator"
 		power: 51
 		ftbranks.name_format: "&b{name}"
 		ftbchunks.max_claimed: 200
-		ftbchunks.max_force_loaded: 5
+		ftbchunks.max_force_loaded: 10
 	}
 	admin: {
 		name: "Admin"

kubejs/assets/tfg/lang/en_us.json

@@ -1395,6 +1395,8 @@
   "tfg.tooltip.component.refrigerant_pellet": "Can be used as an input in the Fission Reactor to cool it down, requires a Material Holder",
   "tfg.tooltip.component.nuclear_turbine_1": "§eBase Production:§r 4096 EU/t",
   "tfg.tooltip.component.nuclear_turbine_2": "Each Rotor Holder above §5EV§r §7adds§r 10% efficiency and multiplies EU/t by 2.",
+  "tfg.gui.refrigerator.unify_dates.enabled": "Expiration Date Unification is: §aOn",
+  "tfg.gui.refrigerator.unify_dates.disabled": "Expiration Date Unification is: §cOff",
   "tfg.machine.food_refrigerator_power_usage": "§7Consumes§r %s EU/t §7while active to keep your food fresh.§r",
   "tfc.jei.flint_knapping": "Flint Knapping",
   "tfc.jei.straw_knapping": "Straw Knapping",