Changes

Summary

Fix rubber trees generating under water (details)
Port basic machines and all their deps (details)

Commit b3780c4bb73ce396b81eeba95c20ee67da2b5220 by player Fix rubber trees generating under water
The file was modified	src/ic2/core/block/Ic2WorldGen.java
Commit dd704973f7c7ddb2a62c3a079dfd5fc7cf77fee5 by player Port basic machines and all their deps
The file was added	src/ic2/core/item/tool/ItemDrillIridium.java
The file was added	src/ic2/core/item/ItemClassicCell.java
The file was removed	resources_pending/assets/ic2/models/item/crop/crop_stick.json
The file was modified	src/ic2/core/EventHandler.java
The file was removed	resources_pending/assets/ic2/models/item/tool/default.json
The file was added	resources/assets/ic2/models/item/diamond_drill.json
The file was added	src/ic2/core/crop/CropVanillaStem.java
The file was added	resources/assets/ic2/blockstates/electric_furnace.json
The file was added	resources/assets/ic2/models/item/hydrated_coal_cell.json
The file was modified	src/ic2/core/block/TileEntityBlock.java
The file was removed	src_pending/ic2/core/crop/CropVanilla.java
The file was removed	src_pending/ic2/core/item/tool/ItemScannerAdv.java
The file was modified	src/ic2/api/crops/CropSoilType.java
The file was added	resources/assets/ic2/models/item/liquid_heat_exchanger.json
The file was added	src/ic2/core/block/machine/tileentity/TileEntityCompressor.java
The file was added	src/ic2/core/crop/cropcard/CropCarrots.java
The file was removed	resources_pending/assets/ic2/models/item/crop/coffee_powder.json
The file was removed	src_pending/ic2/core/crop/cropcard/CropRedWheat.java
The file was added	src/ic2/core/crop/cropcard/CropRedWheat.java
The file was removed	resources_pending/assets/ic2/models/item/crop/crop_seed_bag.json
The file was removed	src_pending/ic2/core/init/OreValues.java
The file was removed	src_pending/ic2/core/crop/cropcard/CropVenomilia.java
The file was removed	src_pending/ic2/core/block/machine/gui/GuiMiner.java
The file was removed	src_pending/ic2/core/crop/cropcard/CropBaseMushroom.java
The file was added	resources/assets/ic2/blockstates/extractor.json
The file was added	src/ic2/core/block/machine/tileentity/TileEntityExtractor.java
The file was added	resources/assets/ic2/models/item/electrolyzed_water_cell.json
The file was removed	resources_pending/assets/ic2/models/item/cell/hydration_cell.json
The file was removed	src_pending/ic2/core/item/tool/ItemDrill.java
The file was added	resources/assets/ic2/models/item/electric_furnace.json
The file was removed	src_pending/ic2/core/block/machine/tileentity/TileEntityPump.java
The file was added	resources/assets/ic2/models/item/drill.json
The file was removed	src_pending/ic2/core/item/armor/ItemArmorCFPack.java
The file was added	src/ic2/core/item/tool/ItemScanner.java
The file was added	src/ic2/core/crop/cropcard/CropColorFlower.java
The file was added	resources/assets/ic2/models/item/fertilizer.json
The file was added	resources/assets/ic2/blockstates/miner.json
The file was added	resources/assets/ic2/models/item/scanner.json
The file was removed	src_pending/ic2/core/crop/cropcard/CropTerraWart.java
The file was removed	resources_pending/assets/ic2/models/item/cell/air_cell.json
The file was removed	resources_pending/assets/ic2/models/item/crop/weed.json
The file was removed	src_pending/ic2/core/crop/cropcard/CropCoffee.java
The file was added	resources/assets/ic2/models/item/grin_powder.json
The file was added	src/ic2/core/item/ItemCropSeed.java
The file was added	src/ic2/core/block/machine/tileentity/TileEntityMiner.java
The file was added	resources/assets/ic2/models/item/mining_pipe.json
The file was added	resources/assets/ic2/models/item/pump.json
The file was added	src/ic2/core/crop/CropVanilla.java
The file was added	src/ic2/core/crop/cropcard/CropBaseSapling.java
The file was removed	resources_pending/assets/ic2/models/item/crop/hops.json
The file was removed	resources_pending/assets/ic2/models/item/tool/electric/advanced_scanner.json
The file was added	resources/assets/ic2/models/item/mining_pipe_tip.json
The file was removed	resources_pending/assets/ic2/models/item/crop/weed_ex.json
The file was added	src/ic2/core/block/machine/container/ContainerClassicCanner.java
The file was removed	src_pending/ic2/core/item/type/CellType.java
The file was added	src/ic2/core/item/armor/ItemArmorCFPack.java
The file was modified	src/ic2/core/ref/Ic2Items.java
The file was added	resources/assets/ic2/blockstates/pump.json
The file was removed	resources_pending/assets/ic2/blockstates/crop.json
The file was removed	src_pending/ic2/core/crop/cropcard/CropBaseMetalCommon.java
The file was added	resources/assets/ic2/models/item/bio_cell.json
The file was removed	src_pending/ic2/core/Ic2Player.java
The file was removed	src_pending/ic2/core/item/tool/GuiToolScanner.java
The file was removed	src_pending/ic2/core/util/PumpUtil.java
The file was added	src/ic2/core/crop/cropcard/CropPotato.java
The file was removed	resources_pending/assets/ic2/models/item/crop/fertilizer.json
The file was added	resources/assets/ic2/models/item/iridium_drill.json
The file was added	src/ic2/core/item/ItemTerraWart.java
The file was added	src/ic2/core/crop/cropcard/CropBaseMushroom.java
The file was added	src/ic2/core/item/tool/GuiToolScanner.java
The file was removed	resources_pending/assets/ic2/models/item/tool/electric/diamond_drill.json
The file was added	resources/assets/ic2/models/item/miner.json
The file was modified	src/ic2/core/ref/Ic2BlockEntities.java
The file was removed	src_pending/ic2/core/item/tool/ContainerToolScanner.java
The file was removed	resources_pending/assets/ic2/models/item/cell/biofuel_cell.json
The file was modified	src_pending/ic2/core/util/StackUtil.java
The file was removed	resources_pending/assets/ic2/models/item/armor/jetpack.json
The file was removed	resources_pending/assets/ic2/models/item/crop/grin_powder.json
The file was added	src/ic2/core/item/armor/jetpack/IJetpack.java
The file was removed	resources_pending/assets/ic2/models/item/tool/electric/drill.json
The file was added	resources/assets/ic2/models/item/coffee_beans.json
The file was added	src/ic2/core/item/tool/ContainerToolScanner.java
The file was removed	src_pending/ic2/core/block/machine/gui/GuiClassicCanner.java
The file was added	src/ic2/core/util/PumpUtil.java
The file was added	src/ic2/core/crop/cropcard/CropHops.java
The file was removed	src_pending/ic2/core/item/tool/ItemScanner.java
The file was removed	src_pending/ic2/core/item/ItemTerraWart.java
The file was removed	src_pending/ic2/core/crop/cropcard/CropCarrots.java
The file was modified	src/ic2/api/crops/ICropTile.java
The file was added	src/ic2/core/crop/cropcard/CropCocoa.java
The file was modified	src-fabric/ic2/fabric/EnvItemHandlerFabric.java
The file was removed	resources_pending/assets/ic2/models/item/crop/terra_wart.json
The file was added	resources/assets/ic2/models/item/coffee_powder.json
The file was added	resources/assets/ic2/models/item/crop_seed_bag.json
The file was added	resources/assets/ic2/models/item/hops.json
The file was added	resources/assets/ic2/models/item/empty_cell.json
The file was removed	src_pending/ic2/core/item/type/CropResItemType.java
The file was modified	src/ic2/core/item/EnvItemHandler.java
The file was modified	src-forge/ic2/forge/EnvItemHandlerForge.java
The file was removed	src_pending/ic2/core/block/machine/tileentity/TileEntityMacerator.java
The file was added	resources/assets/ic2/models/item/crop_stick.json
The file was added	src/ic2/core/init/OreValues.java
The file was removed	src_pending/ic2/core/crop/cropcard/CropCocoa.java
The file was added	src/ic2/core/crop/cropcard/CropFlax.java
The file was removed	src_pending/ic2/core/block/machine/tileentity/TileEntityClassicCanner.java
The file was removed	src_pending/ic2/core/crop/cropcard/CropPumpkin.java
The file was added	src/ic2/core/item/tool/ItemElectricTool.java
The file was added	src/ic2/core/ref/Ic2BlockTags.java
The file was removed	resources_pending/assets/ic2/models/item/cell/weed_ex_cell.json
The file was added	resources/assets/ic2/models/item/extractor.json
The file was added	src/ic2/core/crop/TileEntityCrop.java
The file was removed	src_pending/ic2/core/crop/IC2Crops.java
The file was removed	src_pending/ic2/core/block/machine/container/ContainerClassicCanner.java
The file was added	src/ic2/core/crop/cropcard/CropWeed.java
The file was removed	src_pending/ic2/core/item/ItemCropSeed.java
The file was removed	resources_pending/assets/ic2/models/item/tool/electric/iridium_drill.json
The file was added	resources/assets/ic2/models/item/lava_cell.json
The file was removed	src_pending/ic2/core/crop/TileEntityCrop.java
The file was added	resources/assets/ic2/models/item/terra_wart.json
The file was added	src/ic2/core/block/machine/tileentity/TileEntityElectricFurnace.java
The file was added	src/ic2/core/crop/cropcard/CropVenomilia.java
The file was added	src/ic2/core/crop/cropcard/CropCoffee.java
The file was removed	resources_pending/assets/ic2/models/item/tool/electric/scanner.json
The file was removed	resources_pending/assets/ic2/models/item/crop/hydration_cell.json
The file was removed	src_pending/ic2/core/InvSlotConsumableBlock.java
The file was added	src/ic2/core/Ic2Player.java
The file was removed	src_pending/ic2/core/crop/cropcard/CropBeetroot.java
The file was removed	src_pending/ic2/core/item/armor/ItemArmorUtility.java
The file was removed	src_pending/ic2/core/item/armor/ItemArmorFluidTank.java
The file was removed	src_pending/ic2/core/crop/cropcard/CropWeed.java
The file was added	src/ic2/core/crop/cropcard/CropReed.java
The file was removed	src_pending/ic2/core/block/machine/BlockMiningPipe.java
The file was added	resources/assets/ic2/blockstates/mining_pipe.json
The file was added	src/ic2/core/item/armor/ItemArmorJetpack.java
The file was removed	resources_pending/assets/ic2/models/item/crop/coffee_beans.json
The file was removed	src_pending/ic2/core/item/tool/ItemElectricTool.java
The file was added	src/ic2/core/item/tool/ItemScannerAdv.java
The file was removed	src_pending/ic2/core/crop/cropcard/CropColorFlower.java
The file was removed	src_pending/ic2/core/crop/cropcard/CropFlax.java
The file was removed	src_pending/ic2/core/block/machine/tileentity/TileEntityMiner.java
The file was removed	src_pending/ic2/core/crop/cropcard/CropBaseMetalUncommon.java
The file was added	src/ic2/core/block/machine/container/ContainerMiner.java
The file was added	src/ic2/core/util/BiomeUtil.java
The file was added	src/ic2/core/crop/IC2CropCard.java
The file was removed	resources_pending/assets/ic2/models/item/cell/coalfuel_cell.json
The file was added	src/ic2/core/crop/cropcard/CropStickreed.java
The file was modified	src-fabric/ic2/fabric/EnvProxyFabric.java
The file was added	resources/assets/ic2/models/item/tool/default.json
The file was removed	src_pending/ic2/core/crop/CropVanillaStem.java
The file was added	resources/assets/ic2/models/item/weed.json
The file was added	src/ic2/core/item/armor/ItemArmorFluidTank.java
The file was removed	src_pending/ic2/core/crop/cropcard/CropStickreed.java
The file was added	resources/assets/ic2/models/item/biofuel_cell.json
The file was added	resources/assets/ic2/models/item/cf_pack.json
The file was removed	src_pending/ic2/core/crop/cropcard/CropHops.java
The file was removed	resources_pending/assets/ic2/models/item/armor/cf_pack.json
The file was added	src/ic2/core/ref/Ic2ItemTags.java
The file was removed	resources_pending/assets/ic2/models/item/cell/electrolyzed_water_cell.json
The file was removed	src_pending/ic2/core/crop/cropcard/CropBaseSapling.java
The file was added	src/ic2/core/crop/cropcard/CropEating.java
The file was modified	src/ic2/core/fluid/StandardFluidItem.java
The file was removed	resources_pending/assets/ic2/models/item/cell/hydrated_coal_cell.json
The file was modified	src-forge/ic2/forge/EnvProxyForge.java
The file was added	src/ic2/core/crop/cropcard/CropNetherWart.java
The file was removed	src_pending/ic2/core/item/armor/ItemArmorJetpack.java
The file was removed	src_pending/ic2/core/item/tool/ItemDrillIridium.java
The file was added	src/ic2/core/item/armor/ItemArmorUtility.java
The file was removed	resources_pending/assets/ic2/models/item/cell/empty_cell.json
The file was removed	resources_pending/assets/ic2/models/item/cell/lava_cell.json
The file was added	src/ic2/core/crop/ItemCrop.java
The file was added	src/ic2/core/crop/cropcard/CropPumpkin.java
The file was added	src/ic2/core/crop/cropcard/CropBeetroot.java
The file was added	resources/assets/ic2/blockstates/mining_pipe_tip.json
The file was added	resources/assets/ic2/blockstates/compressor.json
The file was added	src/ic2/core/block/machine/tileentity/TileEntityClassicCanner.java
The file was removed	src_pending/ic2/core/item/tool/HarvestLevel.java
The file was removed	src_pending/ic2/core/crop/cropcard/CropEating.java
The file was removed	src_pending/ic2/core/block/machine/container/ContainerMiner.java
The file was removed	src_pending/ic2/core/crop/ItemCrop.java
The file was added	src/ic2/core/crop/cropcard/CropMelon.java
The file was added	resources/assets/ic2/models/item/weed_ex_cell.json
The file was added	resources/assets/ic2/models/item/macerator.json
The file was added	src/ic2/core/crop/cropcard/CropTerraWart.java
The file was added	src/ic2/core/crop/cropcard/CropWheat.java
The file was added	resources/assets/ic2/models/item/advanced_scanner.json
The file was removed	src_pending/ic2/core/crop/cropcard/CropWheat.java
The file was removed	src_pending/ic2/core/item/ItemFoodIc2.java
The file was added	src/ic2/core/crop/cropcard/CropBaseMetalCommon.java
The file was added	src/ic2/core/crop/IC2Crops.java
The file was removed	src_pending/ic2/core/crop/cropcard/CropReed.java
The file was added	resources/assets/ic2/models/item/hydration_cell.json
The file was added	src/ic2/core/block/machine/gui/GuiMiner.java
The file was added	resources/assets/ic2/models/item/coalfuel_cell.json
The file was modified	src/ic2/api/crops/Crops.java
The file was removed	resources_pending/assets/ic2/models/item/cell/water_cell.json
The file was removed	resources_pending/assets/ic2/models/item/cell/bio_cell.json
The file was removed	src_pending/ic2/core/item/tool/HandHeldScanner.java
The file was removed	src_pending/ic2/core/crop/cropcard/CropMelon.java
The file was added	resources/assets/ic2/models/item/jetpack.json
The file was added	src/ic2/core/item/tool/HandHeldScanner.java
The file was added	resources/assets/ic2/blockstates/classic_canner.json
The file was removed	src_pending/ic2/core/item/ItemClassicCell.java
The file was removed	src_pending/ic2/core/block/machine/tileentity/TileEntityCompressor.java
The file was added	src/ic2/core/block/machine/BlockMiningPipe.java
The file was modified	src/ic2/core/SideProxyClient.java
The file was removed	src_pending/ic2/core/crop/cropcard/CropPotato.java
The file was modified	src/ic2/core/util/StackUtil.java
The file was added	resources/assets/ic2/blockstates/macerator.json
The file was added	resources/assets/ic2/models/item/water_cell.json
The file was added	src/ic2/core/crop/cropcard/CropBaseMetalUncommon.java
The file was added	src/ic2/core/block/machine/gui/GuiClassicCanner.java
The file was removed	src_pending/ic2/core/block/machine/tileentity/TileEntityExtractor.java
The file was removed	src_pending/ic2/core/crop/cropcard/CropNetherWart.java
The file was modified	src/ic2/core/ref/Ic2Blocks.java
The file was added	resources/assets/ic2/blockstates/crop.json
The file was added	resources/assets/ic2/models/item/compressor.json
The file was added	src/ic2/core/item/tool/ItemDrill.java
The file was removed	src_pending/ic2/core/block/machine/tileentity/TileEntityElectricFurnace.java
The file was removed	src_pending/ic2/core/item/armor/jetpack/IJetpack.java
The file was removed	resources_pending/assets/ic2/models/item/filled_fuel_can.json
The file was modified	src/ic2/core/EnvProxy.java
The file was removed	src_pending/ic2/core/crop/IC2CropCard.java
The file was added	resources/assets/ic2/models/item/classic_canner.json
The file was added	src/ic2/core/block/machine/tileentity/TileEntityMacerator.java
The file was added	resources/assets/ic2/models/item/air_cell.json
The file was added	resources/assets/ic2/models/item/filled_fuel_can.json
The file was added	src/ic2/core/block/machine/tileentity/TileEntityPump.java
The file was modified	src/ic2/core/ref/Ic2ScreenHandlers.java
The file was removed	src_pending/ic2/core/util/BiomeUtil.java
The file was added	src/ic2/core/block/invslot/InvSlotConsumableBlock.java
The file was removed	resources_pending/assets/ic2/blockstates/mining_pipe.json