aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/util
AgeCommit message (Collapse)Author
2018-09-06remove nq viDream-Master
2018-09-05Revert "remove Nq reactor."Dream-Master
This reverts commit 2364a365608f23a08cf46b10e1c36835fc66219d.
2018-09-05Merge branch 'New_hightier_stuff_dev' into New_test_devDream-Master
# Conflicts: # src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
2018-09-05Merge branch 'New_hightier_stuff_dev' into New_test_devDream-Master
# Conflicts: # src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
2018-09-05remove Nq reactor.Dream-MasterXXL
@draknyte please add my new fuel to your multiblock. Thanks
2018-09-03Pipe/Cable overhaul & Add filter output on fluid filtersJason Mitchell
* Unified connect() method for pipes/wires - each subclass has it's own canConnect(), letsIn(), and letsOut() methods that map to the specifics for that implementation * Shift Clicking while placing a GT machine will now try connecting to the cable/pipe it is placed on * You can open a connection to the air for pipes & wires, allowing the next thing you place down to auto connect (ie: a JABBA barrel) * Distribute Fluids - Modeled after several of the upstream PRs * Fluid regulators on pipes should stop spazzing out now * Fluid filter covers - Now work with filtering output BUG/TODO: * Spray paint doesn't seem to keep wires/pipes from connecting properly * Spray paint on wires/pipes should force a disconnection check
2018-09-01Merge branch 'experimental' into High_tier_circuits_devDream-Master
2018-09-01remove naq reactor uev and uivDream-Master
2018-08-31add 3 more naq reactor tiersDream-Master
2018-08-31added config option to allow broken recipe map for debug purposesbartimaeusnek
2018-08-21fixed GT Teleporterbartimaeusnek
+ improofed readability a bit (in dependencies in GT_Mod & GT_MetaTileEntity_Teleporter) - removed unused libs
2018-08-15Added powderbarrels to usage. Added recipes to make Adv Seismic Prospectors. ↵Richard Hendricks
Removed recipes for the old ones.
2018-08-15Do radius in blocks. Clean up printouts. Add in chunk information for ↵Richard Hendricks
located ores.
2018-08-15fix radiusRichard Hendricks
2018-06-30pulled small ores into codebartimaeusnek
-removed config for custom ores -removed immensive engineering support -removed magneticraft support -removed PFAAGeologica support +added small ores for GaGreg +version bump
2018-06-20New feature for chestbuffers/superbuffers:Transfer size mode. Instead of ↵Richard Hendricks
matching the output inventory, this mode will only transfer fixed sizes to output invetory. Useful for input hatches to Amazon Packager or PA filled with packagers.
2018-06-18Merge branch 'experimental' into scanner_fixesbartimaeusnek
2018-06-18fix for #2152bartimaeusnek
fix for reused DataSticks keep parts of old NBTTagCompound fixed blockores and removed one hashmap
2018-06-17Smp assembly-line books issures (#128)bartimaeusnek
2018-06-17added GT BlockOres, BlockMetals, BlockGems for Assemblylinebartimaeusnek
2018-06-16fixed Multiple items on one pagebartimaeusnek
2018-06-16fixed minor sorting issurebartimaeusnek
2018-06-16fixed SMP Assembly Line book issures.bartimaeusnek
2018-06-13fix derpDream-Master
2018-03-22Added descriptionWo0kiee
2018-03-22CleanupWo0kiee
# Conflicts: # src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_AdvSeismicProspector.java
2018-03-22deleted formatting codesWo0kiee
2018-03-22Adv Seismic Prospector reworkedWo0kiee
Prospects from NW to SE 9 of oilfields (6x6 chunks each) and output min-max oil amount # Conflicts: # src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_AdvSeismicProspector.java
2018-02-10Make LCR accept 6 inputs, any combination of items or liquids; Re-enable ↵Jason Mitchell
High Octane Gas in the LCR
2018-02-05Added documentation to updateTexture in GT_MetaTileEntity_Hatch.Alkalus
Added a function to GT_Utility called addTexturePage(byte page). Added information about who is using which texture page in GT_Block_Casings1. Updated GT_Block_Casings5 & GT_Block_Casings8 to utilise texture page 1. Updated Large Chemical Reactor to reflect this change, now also uses Page 1 Index 48. Moved the Pyrolyse oven casing index from 111 to 22, which is currently unused and within the Gregtech index space.
2018-01-07Oredict support for asslineAntifluxfield
2018-01-07NEI page access of Primitive Blast Furnace (#78)Martin Robertz
* NEI page access of Primitive Blast Furnace cherry pick Commit: e0be4bdc4504717968494503ea03b8184af96891 [e0be4bd] * Fix #1039 * Fix #1039
2018-01-01Arc Furnace uses now 30 instead of 32 eu /3 ampsDream-Master
2017-12-31Fix UO blacklistTechnus
2017-12-26Config to disable placeholder "%material"Antifluxfield
2017-12-24Optimize imports an add molten cellsTechnus
2017-11-29cherry pickAntifluxfield
Commit: c89a99c36d3f415f89882d8b418f99c3c5d3b974 [c89a99c] Fix wrong translation
2017-11-13GT6 styled pipesAntifluxfield
2017-10-19l10n improveAntifluxfield
2017-10-07Merge branch 'patch-1' of https://github.com/Ethryan/GT5-Unofficial into ↵Technus
experimental With changes
2017-10-07cherry pickAntifluxfield
0802fdbd0272c4251c4615026643c8eadcf7fe70 9d8ac82535b0099ef70e8995bca51f62f39f9f94 e725c455b3d9025caeebdbf12cc9d25f238f74bb 3db38a5c53a771aeb37a8cf2568f79c49bb38c21 aef60bbf3b6752963b51c9c4e27b6ba03f75ba8c ef41455fe59f2915c94c204b97cee19aa2ddcd3b 4372034ff4edc9e58629d63123b84c29e6e0e516 Drillers fix #1230 https://github.com/Blood-Asp/GT5-Unofficial/pull/1230
2017-09-30Annoying space.Technus
2017-09-13Add more uo methods for reading easily, make consumption scaleableTechnus
Makes the code more A ok
2017-09-12cherry pickDream-Master
bd305c45b038819de2a0e61166da7344dbc770c7 69d557908f447be138102676309e48e5f95b32b9 Fix localization of Item Distributor #1211 https://github.com/Blood-Asp/GT5-Unofficial/pull/1211
2017-08-15Fix string localization.Technus
2017-08-13fix derpDream-Master
2017-08-13cherry pickJohannes Gäßler
Commit: a184258c98049a713eca0cf4dcac9f69c41ad5b4 [a184258] Reverted the changes to basic machine processing. Basic Machines no longer automatically add an integrated circuit to their input.
2017-08-12Show dim id in scannerDaniel
2017-08-12cherry pickDream-Master
Commit: 2c50b0a82583aa90ded647fa61f2cc0f278ff4d2 [2c50b0a] Merge pull request #1157 from Dimach/unstable-1 Fixed bug - isAllowedToPutIntoSlot don't check size of inventory.
2017-08-03Added an option to findRecipe() to only return recipes with enough inputJohannes Gäßler
generated by cgit (git 2.46.0) at 2025-03-07 08:54:04 +0000