aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-02-05Merge branch 'release/5.0.0'Tec
# Conflicts: # dependencies.gradle
2022-02-05Fix recipe conflict with ULV Magneto Resonatic Circuit (#85)miozune
Former-commit-id: b2482ad25df9325db4ae77ee3920aba1476226ff
2022-02-05Merge branch 'feature/OrbitalAffinity' into developTec
2022-02-05Initial Orbvital afffinity implTec
2022-02-05First half of end of bastnasite lineunknown
2022-02-04Updates (#84)Jason Mitchell
* Update to work w/ new GT5u rendering code * explicitly depend on tectech * Remove deprecated tectech ICustomBlockSetting interface Former-commit-id: 4aa48a3f9af82af04cb39dd1c406d5245b44fbea
2022-02-04Texture Shenanigans (#915)Jason Mitchell
* Texture Shenanigans - Get rid of all the TODOs and run everything through the new Texture API in a backwards compatible way. * allow bw runclient to run * Add obf name Co-authored-by: bombcar <github@bombcar.com>
2022-02-04Add 2 more transmute recipes (#921)Pao
2022-02-04Translation related fixes (#920)Glease
* Translation related fixes * Rename trans to transItem
2022-02-04Merge pull request #37 from GTNewHorizons/nei-rect-handler-cleanupMartin Robertz
Don't override GT5U's GT_RectHandler
2022-02-04GT_RectHandler now relies on an interface (#916)YannickMG
and not specific class names
2022-02-04Paperbark tweak (#917)miozune
2022-02-04Revert trans changes for GT_Generic_Item and descendants (#919)YannickMG
2022-02-04Changed DT Water Distillation Recipe (#918)Steelux
* Changed DT Water Distillation Recipe - Changed input and output values to match, and rounded them up to a round number. * Changed Values to 1000L - Changed input and output to 1 bucket, about 4 times what they were before, and doubled both the duration and EU/t cost. * Changed EU/t to Allow Some Loss in MV
2022-02-03Don't override GT5U's GT_RectHandlerYannickMG
2022-02-04Merge branch 'Elisis:main' into mainElisis
2022-02-04Remove scala importsunknown
2022-02-03trigger warningJason Mitchell
2022-02-03LGPL-3.0 (#83)bombcar
* updatebuild * update license Former-commit-id: ef47ff063e28721d0f93e0f19d3d7067664da60f
2022-02-03Basic Machine NEI Power Tiers (#914)YannickMG
* Add IntelliJ .shelf folder to .gitignore * Fixing GT_GuiTooltip bug I introduced * Deprecated superfluous String trans methods. * Add Power class to compute and describe power usage * trans -> GT_Utility.trans Removed absent param from Javadoc * Add Power to BasicMachine and use it for power calculations * Steam BasicMachine rework Have Bronze and Steel tier override Power with appropriate SteamPower Make Bronze machines explicitly tier 1 Make Steel machines explicitly tier 2 Defined recipe list and bricked status for each machine Unified checkRecipe uses machine's recipe list and Power * Raised NEI dependency to 2.2.5 * Defining NEI transfer rect in individual UIs Using a new interface called from GT_RectHandler * Code cleanup & minor refactor * Add power field to NEI Default Handler Add method to create Power object from the recipe map * Display power tier in NEI handler name * User Power to draw NEI Handler description * Enable filtering handler recipes using Power * Repurposing aBricked parameter into aHighPressure To fix my previous faulty method of setting mTier * Must call getCache to get recipes properly. * Better communicate NEI Overclock info
2022-02-02Pulverize Cobweb to String (#913)Steelux
- Added a recipe to pulverize Cobweb to String, at a 1:1 ration until HV Macerator, where there's a 50% chance to get one more.
2022-02-02Merge branch 'OrbitalAffinity' into feature/OrbitalAffinityTec
2022-02-02no messageTec
2022-02-02Merge branch 'master' into developTec
# Conflicts: # dependencies.gradle
2022-02-02Merge branch 'develop' into OrbitalAffinityTec
# Conflicts: # src/main/java/com/github/technus/tectech/mechanics/anomaly/AnomalyHandler.java
2022-02-02Cleanup master dependenciesTec
2022-02-02Add world edit cuiTec
2022-02-02Bump GT5 version, fix 484L ASMD overflow and add bio/wetware xSMD support.GTNH-Colen
2022-02-02Bump GT5 version, fix 484L ASMD overflow.GTNH-Colen
2022-02-01Sort things out in the load orderTec
2022-02-01Add input bus like sorting to chest and super buffers (#900)Johann Bernhardt
* Add input bus like sorting to chest and super buffers * Remove unused import
2022-02-01Make the gaem boot with all the nice stuffTec
2022-02-01Reserve meta IDs for glowredman (#912)glowredman
2022-02-01Reserve MTE IDs for glee8e (#911)Glease
2022-02-01read/write set for yothatchGlodBlock
2022-02-01format numberGlodBlock
2022-02-01allow multi output for yottankGlodBlock
2022-02-01Further recipe additionunknown
2022-01-31Fix incorrect sorted recipe list cachingGlease
2022-01-31Fix structuresTec
2022-01-31Cleanup structuresTec
2022-01-31Make font not use UTF-8 literalTec
2022-01-31Merge branch 'NHmaster'Tec
# Conflicts: # build.gradle
2022-01-31Merge branch 'GTMEGA/nh-upstream'Tec
2022-01-31Merge branch 'Yote'Tec
# Conflicts: # build.gradle.kts # dependencies/OpenModularTurrets-1.7.10-2.2.10-237-deobf.jar # gradle.properties # real.gradle.properties # 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/proxy/ClientProxy.java # src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_annihilation.java # src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_bhg.java # src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java # src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_crafting.java # src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dataBank.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_infuser.java # src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.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_research.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/GT_MetaTileEntity_EM_stabilizer.java # src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_switch.java # src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java # src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_wormhole.java # src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java # src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.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
2022-01-31Merge branch 'GTNH/Upstream'Tec
# 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
2022-01-31Merge pull request #33 from GTNewHorizons/long-asslineboubou19
Long Assline
2022-01-31Make the TT_RecipeAdder accept AssemblyLine recipes with 16 inputsglowredman
2022-01-31remove proxyGlodBlock
2022-01-31start the work of large fusionGlodBlock
generated by cgit (git 2.34.1) at 2026-05-27 21:11:36 +0000