Merge remote-tracking branch 'origin/master-1.19-lts' into master-1.20-lts

Author: rubensworks

CHANGELOG-1.19.2.md

@@ -1,8 +1,24 @@
 # Changelog for Minecraft 1.19.2
 All notable changes to this project will be documented in this file.
 
+<a name="1.19.2-1.30.1"></a>
+## [1.19.2-1.30.1](/compare/1.19.2-1.30.0...1.19.2-1.30.1) - 2026-03-28 09:54:36
+
+
+### Added
+* Add configurable energy production rate for coal generator (#1635), Closes #1634
+
+<a name="1.19.2-1.30.0"></a>
+## [1.19.2-1.30.0](/compare/1.19.2-1.29.3...1.19.2-1.30.0) - 2026-02-17 10:58:05 +0100
+
+
+### Added
+* Document logical NBT expressions, CyclopsMC/CyclopsCore#210
+* Add config options for minimum update intervals for parts, Closes CyclopsMC/IntegratedTunnels#349
+* Add config option to log card IDs during evaluation, Closes #1345
+
 <a name="1.19.2-1.29.3"></a>
-## [1.19.2-1.29.3](/compare/1.19.2-1.29.2...1.19.2-1.29.3) - 2026-01-17 14:00:53
+## [1.19.2-1.29.3](/compare/1.19.2-1.29.2...1.19.2-1.29.3) - 2026-01-17 14:00:53 +0100
 
 
 ### Added

resources/changelog/1.19.2-1.30.0.txt

@@ -0,0 +1,7 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 1.20.0 or higher.
+
+Additions:
+* Document logical NBT expressions, CyclopsMC/CyclopsCore#210
+* Add config options for minimum update intervals for parts, Closes CyclopsMC/IntegratedTunnels#349
+* Add config option to log card IDs during evaluation, Closes #1345

resources/changelog/1.19.2-1.30.1.txt

@@ -0,0 +1,5 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 1.20.0 or higher.
+
+Additions:
+* Add configurable energy production rate for coal generator (#1635), Closes #1634

src/main/java/org/cyclops/integrateddynamics/blockentity/BlockEntityCoalGenerator.java

@@ -160,13 +160,13 @@ public static class Ticker extends BlockEntityCableConnectableInventory.Ticker<B
         protected void update(Level level, BlockPos pos, BlockState blockState, BlockEntityCoalGenerator blockEntity) {
             super.update(level, pos, blockState, blockEntity);
 
-            if((!blockEntity.getInventory().getItem(SLOT_FUEL).isEmpty() || blockEntity.isBurning()) && blockEntity.canAddEnergy(ENERGY_PER_TICK)) {
+            if((!blockEntity.getInventory().getItem(SLOT_FUEL).isEmpty() || blockEntity.isBurning()) && blockEntity.canAddEnergy(BlockEntityCoalGeneratorConfig.energyPerTick)) {
                 if (blockEntity.isBurning()) {
                     if (blockEntity.currentlyBurning++ >= blockEntity.currentlyBurningMax) {
                         blockEntity.currentlyBurning = 0;
                         blockEntity.currentlyBurningMax = 0;
                     }
-                    int toFill = ENERGY_PER_TICK;
+                    int toFill = BlockEntityCoalGeneratorConfig.energyPerTick;
                     blockEntity.addEnergy(toFill);
                     blockEntity.setChanged();
                 }

src/main/java/org/cyclops/integrateddynamics/blockentity/BlockEntityCoalGeneratorConfig.java

@@ -2,6 +2,8 @@
 
 import com.google.common.collect.Sets;
 import net.minecraft.world.level.block.entity.BlockEntityType;
+import net.minecraftforge.fml.config.ModConfig;
+import org.cyclops.cyclopscore.config.ConfigurableProperty;
 import org.cyclops.cyclopscore.config.extendedconfig.BlockEntityConfig;
 import org.cyclops.integrateddynamics.IntegratedDynamics;
 import org.cyclops.integrateddynamics.RegistryEntries;
@@ -13,6 +15,9 @@
  */
 public class BlockEntityCoalGeneratorConfig extends BlockEntityConfig<BlockEntityCoalGenerator> {
 
+    @ConfigurableProperty(category = "machine", comment = "The energy production rate (in RF/t) of the coal generator.", minimalValue = 1, configLocation = ModConfig.Type.SERVER)
+    public static int energyPerTick = 20;
+
     public BlockEntityCoalGeneratorConfig() {
         super(
                 IntegratedDynamics._instance,