diff options
| author | Tec <daniel112092@gmail.com> | 2022-01-31 19:11:53 +0100 |
|---|---|---|
| committer | Tec <daniel112092@gmail.com> | 2022-01-31 19:11:53 +0100 |
| commit | cb9e2737143ff6b294987a6df681a19e15322c88 (patch) | |
| tree | 2c229aa7fcbd8cbd1cc330d7da2467e1fd321775 /build.gradle.kts | |
| parent | 197d8997d5994e80b62464031e5d3758caf38809 (diff) | |
| parent | 32c91825fa6c15ca55591d08bece00c6dd9d2077 (diff) | |
| download | GT5-Unofficial-cb9e2737143ff6b294987a6df681a19e15322c88.tar.gz GT5-Unofficial-cb9e2737143ff6b294987a6df681a19e15322c88.tar.bz2 GT5-Unofficial-cb9e2737143ff6b294987a6df681a19e15322c88.zip | |
Merge branch 'GTNH/Upstream'
# Conflicts:
# build.gradle.kts
# src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java
# src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java
# src/main/java/com/github/technus/tectech/loader/MainLoader.java
# src/main/java/com/github/technus/tectech/loader/recipe/BaseRecipeLoader.java
# src/main/java/com/github/technus/tectech/thing/casing/GT_Block_HintTT.java
# src/main/java/com/github/technus/tectech/thing/item/ConstructableTriggerItem.java
# src/main/java/com/github/technus/tectech/thing/item/FrontRotationTriggerItem.java
# src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java
# src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java
# src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java
# src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java
# src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java
# src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_collider/GT_MetaTileEntity_EM_collider.java
# src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/GT_MetaTileEntity_EM_machine.java
Diffstat (limited to 'build.gradle.kts')
0 files changed, 0 insertions, 0 deletions