diff options
| author | iouter <62897714+iouter@users.noreply.github.com> | 2022-01-07 12:36:06 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-07 12:36:06 +0800 |
| commit | 0834d4b8b45a881f36ed5b295ac0fb38df49fa9a (patch) | |
| tree | 6fb4a45cf17dd22748148417bc7bb0efb850cea3 | |
| parent | ea1439a4195c8f77c45625ea2593a232bf19984e (diff) | |
| parent | 9b2e050151ad93170e84321d067d1e9d4ded4ba5 (diff) | |
| download | GT5-Unofficial-0834d4b8b45a881f36ed5b295ac0fb38df49fa9a.tar.gz GT5-Unofficial-0834d4b8b45a881f36ed5b295ac0fb38df49fa9a.tar.bz2 GT5-Unofficial-0834d4b8b45a881f36ed5b295ac0fb38df49fa9a.zip | |
Merge branch 'GTNewHorizons:master' into master
| -rw-r--r-- | .circleci/config.yml | 65 | ||||
| -rw-r--r-- | .gitattributes | 17 | ||||
| -rw-r--r-- | .github/scripts/test-no-crash-reports.sh | 9 | ||||
| -rw-r--r-- | .github/workflows/build-and-test.yml | 45 | ||||
| -rw-r--r-- | .github/workflows/release-tags.yml | 45 | ||||
| -rw-r--r-- | .gitignore | 168 | ||||
| -rw-r--r-- | .gradle/2.0/taskArtifacts/cache.properties | 1 | ||||
| -rw-r--r-- | .gradle/2.0/taskArtifacts/cache.properties.lock | bin | 17 -> 0 bytes | |||
| -rw-r--r-- | .gradle/2.0/taskArtifacts/fileHashes.bin | bin | 521607 -> 0 bytes | |||
| -rw-r--r-- | .gradle/2.0/taskArtifacts/fileSnapshots.bin | bin | 4430057 -> 0 bytes | |||
| -rw-r--r-- | .gradle/2.0/taskArtifacts/outputFileStates.bin | bin | 18872 -> 0 bytes | |||
| -rw-r--r-- | .gradle/2.0/taskArtifacts/taskArtifacts.bin | bin | 29153 -> 0 bytes | |||
| -rw-r--r-- | .project | 23 | ||||
| -rw-r--r-- | Recommended.txt | 1 | ||||
| -rw-r--r-- | SupporterList.txt | 2 | ||||
| -rw-r--r-- | _config.yml | 1 | ||||
| -rw-r--r-- | addon.gradle | 3 | ||||
| -rw-r--r-- | bitbucket-pipelines.yml.disabled | 19 | ||||
| -rw-r--r-- | build.gradle | 718 | ||||
| -rw-r--r-- | build.properties | 6 | ||||
| -rw-r--r-- | changelog.mustache | 29 | ||||
| -rw-r--r-- | changelogcurse.mustache | 20 | ||||
| -rw-r--r-- | changeloggeneral.mustache | 17 | ||||
| -rw-r--r-- | dependencies.gradle | 54 | ||||
| -rw-r--r-- | gradle.properties | 64 | ||||
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.jar | bin | 53324 -> 55616 bytes | |||
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 3 | ||||
| -rwxr-xr-x | gradlew | 98 | ||||
| -rw-r--r-- | gradlew.bat | 30 | ||||
| -rw-r--r-- | jitpack.yml | 2 | ||||
| -rw-r--r-- | repositories.gradle | 26 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/gui/machine/GUI_VolumetricFlaskSetter.java | 183 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/gui/widget/GuiValueField.java | 86 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/item/base/rods/BaseItemRod.java | 49 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/item/base/rods/BaseItemRodLong.java | 46 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/item/base/screws/BaseItemScrew.java | 32 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/material/nuclear/NUCLIDE.java | 129 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/recipe/RECIPES_SeleniumProcessing.java | 218 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/nei/GTPP_NEI_DefaultHandler.java | 822 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/nei/GT_NEI_FlotationCell.java | 462 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/nei/GT_NEI_FluidReactor.java | 507 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/nei/GT_NEI_MillingMachine.java | 472 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/nei/GT_NEI_RFPP.java | 515 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/nei/GT_NEI_VacFurnace.java | 482 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/nei/GT_NEI_multiCentriElectroFreezer.java | 554 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_AirIntake.java | 289 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_ElementalDuplicator.java | 993 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java | 632 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/loaders/misc/AddCustomMachineToPA.java | 51 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_LFTR.java | 98 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLFTR.java | 27 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/enums/TAE.java (renamed from src/Java/gregtech/api/enums/TAE.java) | 0 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/util/EmptyRecipeMap.java (renamed from src/Java/gregtech/api/util/EmptyRecipeMap.java) | 0 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/util/FishPondFakeRecipe.java (renamed from src/Java/gregtech/api/util/FishPondFakeRecipe.java) | 0 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/util/GTPP_Recipe.java (renamed from src/Java/gregtech/api/util/GTPP_Recipe.java) | 18 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/util/GasSpargingRecipe.java | 99 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/util/GasSpargingRecipeMap.java | 48 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/util/HotFuel.java (renamed from src/Java/gregtech/api/util/HotFuel.java) | 0 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/util/SemiFluidFuelHandler.java (renamed from src/Java/gregtech/api/util/SemiFluidFuelHandler.java) | 0 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/util/ThermalFuel.java (renamed from src/Java/gregtech/api/util/ThermalFuel.java) | 0 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/GTplusplus.java (renamed from src/Java/gtPlusPlus/GTplusplus.java) | 92 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/GenerateDictionaries.java (renamed from src/Java/gtPlusPlus/GenerateDictionaries.java) | 0 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/RoadMap.java (renamed from src/Java/gtPlusPlus/RoadMap.java) | 0 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/api/damage/DamageTeslaTower.java (renamed from src/Java/gtPlusPlus/api/damage/DamageTeslaTower.java) | 0 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/api/enums/ParticleNames.java (renamed from src/Java/gtPlusPlus/api/enums/ParticleNames.java) | 0 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/api/enums/Quality.java (renamed from src/Java/gtPlusPlus/api/enums/Quality.java) | 0 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/api/helpers/GregtechPlusPlus_API.java (renamed from src/Java/gtPlusPlus/api/helpers/GregtechPlusPlus_API.java) | 0 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/api/helpers/MaterialHelper.java (renamed from src/Java/gtPlusPlus/api/helpers/MaterialHelper.java) | 0 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/api/interfaces/IChunkLoader.java (renamed from src/Java/gtPlusPlus/api/interfaces/IChunkLoader.java) | 0 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/api/interfaces/IComparableRecipe.java (renamed from src/Java/gtPlusPlus/api/interfaces/IComparableRecipe.java) | 0 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/api/interfaces/IEntityCatcher.java (renamed from src/Java/gtPlusPlus/api/interfaces/IEntityCatcher.java) | 0 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/api/interfaces/IGeneratorWorld.java (renamed from src/Java/gtPlusPlus/api/interfaces/IGeneratorWorld.java) | 0 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/api/interfaces/IGregtechPacketEntity.java (renamed from src/Java/gtPlusPlus/api/interfaces/IGregtechPacketEntity.java) | 0 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/api/interfaces/IGregtechPower.java (renamed from src/Java/gtPlusPlus/api/interfaces/IGregtechPower.java) | 0 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/api/interfaces/ILazyCoverable.java (renamed from src/Java/gtPlusPlus/api/interfaces/ILazyCoverable.java) | 0 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/api/interfaces/IPlugin.java (renamed from src/Java/gtPlusPlus/api/interfaces/IPlugin.java) | 0 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/api/interfaces/IRandomGenerator.java (renamed from src/Java/gtPlusPlus/api/interfaces/IRandomGenerator.java) | 0 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/api/interfaces/ITexturedBlock.java (renamed from src/Java/gtPlusPlus/api/interfaces/ITexturedBlock.java) | 0 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/api/interfaces/ITileTooltip.java (renamed from src/Java/gtPlusPlus/api/interfaces/ITileTooltip.java) | 0 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/api/interfaces/IToolable.java (renamed from src/Java/gtPlusPlus/api/interfaces/IToolable.java) | 0 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/api/interfaces/RunnableWithInfo.java (renamed from src/Java/gtPlusPlus/api/interfaces/RunnableWithInfo.java) | 0 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/api/objects/GregtechException.java (renamed from src/Java/gtPlusPlus/api/objects/GregtechException.java) | 0 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/api/objects/Logger.java (renamed from src/Java/gtPlusPlus/api/objects/Logger.java) | 2 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/api/objects/data/AutoMap.java (renamed from src/Java/gtPlusPlus/api/objects/data/AutoMap.java) | 12 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/api/objects/data/ConcurrentHashSet.java (renamed from src/Java/gtPlusPlus/api/objects/data/ConcurrentHashSet.java) | 0 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/api/objects/data/ConcurrentSet.java (renamed from src/Java/gtPlusPlus/api/objects/data/ConcurrentSet.java) | 0 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/api/objects/data/FlexiblePair.java (renamed from src/Java/gtPlusPlus/api/objects/data/FlexiblePair.java) | 0 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/api/objects/data/ObjMap.java (renamed from src/Java/gtPlusPlus/api/objects/data/ObjMap.java) | 0 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/api/objects/data/Pair.java (renamed from src/Java/gtPlusPlus/api/objects/data/Pair.java) | 0 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/api/objects/data/Quad.java (renamed from src/Java/gtPlusPlus/api/objects/data/Quad.java) | 0 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/api/objects/data/ReverseAutoMap.java (renamed from src/Java/gtPlusPlus/api/objects/data/ReverseAutoMap.java) | 0 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/api/objects/data/Triplet.java (renamed from src/Java/gtPlusPlus/api/objects/data/Triplet.java) | 0 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/api/objects/data/TypeCounter.java (renamed from src/Java/gtPlusPlus/api/objects/data/TypeCounter.java) | 0 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/api/objects/data/WeightedCollection.java (renamed from src/Java/gtPlusPlus/api/objects/data/WeightedCollection.java) | 0 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/api/objects/data/weakref/WeakAutoMap.java (renamed from src/Java/gtPlusPlus/api/objects/data/weakref/WeakAutoMap.java) | 0 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/api/objects/minecraft/AABB.java (renamed from src/Java/gtPlusPlus/api/objects/minecraft/AABB.java) | 0 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/api/objects/minecraft/BTF_FluidTank.java (renamed from src/Java/gtPlusPlus/api/objects/minecraft/BTF_FluidTank.java) | 0 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/api/objects/minecraft/BTF_Inventory.java (renamed from src/Java/gtPlusPlus/api/objects/minecraft/BTF_Inventory.java) | 0 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/api/objects/minecraft/BlockPos.java (renamed from src/Java/gtPlusPlus/api/objects/minecraft/BlockPos.java) | 0 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/api/objects/minecraft/CubicObject.java (renamed from src/Java/gtPlusPlus/api/objects/minecraft/CubicObject.java) | 0 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/api/objects/minecraft/DimChunkPos.java (renamed from src/Java/gtPlusPlus/api/objects/minecraft/DimChunkPos.java) | 0 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/api/objects/minecraft/FakeBlockPos.java (renamed from src/Java/gtPlusPlus/api/objects/minecraft/FakeBlockPos.java) | 0 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/api/objects/minecraft/FakeWorld.java (renamed from src/Java/gtPlusPlus/api/objects/minecraft/FakeWorld.java) | 0 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/api/objects/minecraft/FluidGT6.java (renamed from src/Java/gtPlusPlus/api/objects/minecraft/FluidGT6.java) | 0 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/api/objects/minecraft/FormattedTooltipString.java (renamed from src/Java/gtPlusPlus/api/objects/minecraft/FormattedTooltipString.java) | 0 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/api/objects/minecraft/GenericStack.java (renamed from src/Java/gtPlusPlus/api/objects/minecraft/GenericStack.java) | 0 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/api/objects/minecraft/ItemPackage.java (renamed from src/Java/gtPlusPlus/api/objects/minecraft/ItemPackage.java) | 0 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/api/objects/minecraft/ItemStackData.java (renamed from src/Java/gtPlusPlus/api/objects/minecraft/ItemStackData.java) | 0 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/api/objects/minecraft/NoConflictGTRecipeMap.java (renamed from src/Java/gtPlusPlus/api/objects/minecraft/NoConflictGTRecipeMap.java) | 0 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/api/objects/minecraft/SafeTexture.java (renamed from src/Java/gtPlusPlus/api/objects/minecraft/SafeTexture.java) | 0 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/api/objects/minecraft/ShapedRecipe.java (renamed from src/Java/gtPlusPlus/api/objects/minecraft/ShapedRecipe.java) | 0 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/api/objects/minecraft/TexturePackage.java (renamed from src/Java/gtPlusPlus/api/objects/minecraft/TexturePackage.java) | 0 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/api/objects/minecraft/ThreadPooCollector.java (renamed from src/Java/gtPlusPlus/api/objects/minecraft/ThreadPooCollector.java) | 0 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/api/objects/minecraft/multi/NoEUBonusMultiBehaviour.java (renamed from src/Java/gtPlusPlus/api/objects/minecraft/multi/NoEUBonusMultiBehaviour.java) | 0 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/api/objects/minecraft/multi/NoOutputBonusMultiBehaviour.java (renamed from src/Java/gtPlusPlus/api/objects/minecraft/multi/NoOutputBonusMultiBehaviour.java) | 0 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/api/objects/minecraft/multi/NoSpeedBonusMultiBehaviour.java (renamed from src/Java/gtPlusPlus/api/objects/minecraft/multi/NoSpeedBonusMultiBehaviour.java) | 0 | ||||
| -rw-r--r-- |