aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech
AgeCommit message (Collapse)Author
2021-02-26fix regulators not workingkorneel vandamme
2021-02-26fix running asslinecrash on data hatch breakbotn365
fix that when a fully formed assline with data hatch and when the data hatch would be replaced the onRunningTick would crash and stop the assline from ticking the recipe progression
2021-02-26fix regulator ignoring pipeconectionsbotn365
fix that regulators would draw /fill fluids from a pipe even if it wasent conected to that side #7523
2021-02-25Reshuffle new constructor args to avoid conflict with GT++ ASMrepo_alt
2021-02-25Added back bus constructor for "backwards" compatrepo_alt
2021-02-25Merge pull request #442 from GTNewHorizons/patch-pump-idleMartin Robertz
Prevent retract pipe when drill tip can move down
2021-02-25Make ME hatch have zero slots, to avoid items being stuck inside (#439)repo-alt
* Make ME hatch have zero slots, to avoid items being stuck inside * added a missing whitespace Co-authored-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
2021-02-25Prevent retract pipe when drill tip can move downGlease
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
2021-02-24Merge pull request #437 from GTNewHorizons/RenderAOLéa Gris
feat(render): tile ambient occlusion
2021-02-25Merge pull request #440 from GTNewHorizons/patch-water-bottle-divide-0Glease
Fix bottled water filling
2021-02-22Fix bottled water fillingGlease
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
2021-02-22Pickup fluid instead if the input tank is fullGlease
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
2021-02-16feat(render): tile ambient occlusionLéa Gris
Render smooth lighting ambient occlusion on all Gregtech tiles: - Ores - Machines - Pipes, Cables, Wires, Frames Add new Client-side configuration entry in Gregtech.cfg. If false, the flat lighting rendering of older versions is used. ```yml render { B:TileAmbientOcclusion_true=true } ```
2021-02-16Merge pull request #438 from repo-alt/experimentalrepo-alt
Make AE2 dependency actually optional
2021-02-16Make AE2 dependency actually optionalrepo_alt
2021-02-16Fixes Disassembler tooltipbartimaeusnek
2021-02-10Merge pull request #434 from GTNewHorizons/gui-manipulate-fluidMartin Robertz
Fix bucket gui fluid manipulation
2021-02-10Fix bit fiddlingGlease
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
2021-02-10Fix bucket gui fluid manipulationGlease
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
2021-02-09Merge pull request #431 from repo-alt/experimentalMartin Robertz
Better quantum chest integration
2021-02-09Merge pull request #433 from GTNewHorizons/NoX-programer-amber-gem-recipeMartin Robertz
amber dust -> gem recipe
2021-02-09amber dust -> gem recipe for ↵NoX-programer
https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/3141 For some reason GregTech_API.sThaumcraftCompat.addCrucibleRecipe adds only thaumonomicon visible recipe, but not actual recipe. So with this line and recipe, added via script, we got complete working recipe for amber gem drom dust.
2021-02-09Allows manipulating multiple cell worth of fluidGlease
Left click to do as many manipulation as possible. Right click to just manipulate once. Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
2021-02-08Better quantum chest integrationrepo_alt
https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/7448
2021-02-09Fix size 0 fluid stackGlease
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
2021-02-01Merge pull request #429 from GTNewHorizons/autoclave-fluid-outMartin Robertz
allow autoclave to have fluid out in recipe
2021-02-01allow autoclave to have fluid out in recipekorneel vandamme
2021-01-31Address reviewsGlease
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
2021-01-31BasicMachine fluid tank manipulations in GUIGlease
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
2021-01-31change(GT)Glowstone centrifuge recipeDreamMasterXXL
Centrifuging glowstone inneficient recipe #7413 https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/7413
2021-01-30Merge pull request #426 from KiloJoel/shadowmetalBeeFixMartin Robertz
added GT shadowmetal block, fixed bee crash from new TM
2021-01-29added GT shadowmetal block, no texture yetKiloJoel
2021-01-29multipipe drain() method ignores requested fluid types after firstrepo_alt
https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/7405
2021-01-29Minor chemical fixes and tweaksGlease
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
2021-01-28Forgot to editEthryan
Fluid value
2021-01-28Changed the Carbon fibre recipe a littleEthryan
The one with Polybenzimidazole in it
2021-01-26Merge pull request #420 from repo-alt/experimentalMartin Robertz
Drillers correctly reuse old mining pipes
2021-01-25feat(i18n): itemlist withname localeLéa Gris
Automatically generates entries into `Gregtech.lang` for items with custom names (mostly used for recipes display in NEI). Ported from: https://github.com/Blood-Asp/GT5-Unofficial/pull/1552 Will provide new localization keys and default English texts. Newly generated entries in `Gregtech.lang`: ```yaml S:gt.metaitem.01.32707.with.CopyOfTheOrb.name=Copy of the Orb S:gt.metaitem.01.32707.with.OrbToCopy.name=Orb to copy S:gt.metaitem.01.32707.with.OrbToOverwrite.name=Orb to overwrite S:gt.metaitem.01.32708.with.AnalyzedProspectionData.name=Analyzed Prospection Data S:gt.metaitem.01.32708.with.CopyOfTheStick.name=Copy of the Stick S:gt.metaitem.01.32708.with.RawProspectionData.name=Raw Prospection Data S:gt.metaitem.01.32708.with.ReadsResearchResult.name=Reads Research result S:gt.metaitem.01.32708.with.ScannedBookData.name=Scanned Book Data S:gt.metaitem.01.32708.with.ScannedMapData.name=Scanned Map Data S:gt.metaitem.01.32708.with.ScannedSchematic.name=Scanned Schematic S:gt.metaitem.01.32708.with.StickToCopy.name=Stick to copy S:gt.metaitem.01.32708.with.StickToOverwrite.name=Stick to overwrite S:gt.metaitem.01.32708.with.StickToSaveItTo.name=Stick to save it to S:gt.metaitem.01.32708.with.WithPunchCardData.name=With Punch Card Data S:gt.metaitem.01.32708.with.WithScannedBookData.name=With Scanned Book Data S:gt.metaitem.01.32708.with.WithScannedMapData.name=With Scanned Map Data S:gt.metaitem.01.32708.with.WritesResearchResult.name=Writes Research result S:ic2.crop.invalid.with.ScannedSeeds.name=Scanned Seeds S:item.for.beeDroneGE.with.ScannedDrone.name=Scanned Drone S:item.for.beeLarvaeGE.with.ScannedLarvae.name=Scanned Larvae S:item.for.beePrincessGE.with.ScannedPrincess.name=Scanned Princess S:item.for.beeQueenGE.with.ScannedQueen.name=Scanned Queen S:item.for.butterflyGE.with.ScannedButterfly.name=Scanned Butterfly S:item.for.caterpillarGE.with.ScannedCaterpillar.name=Scanned Caterpillar S:item.for.pollenFertile.with.ScannedPollen.name=Scanned Pollen S:item.for.sapling.with.ScannedSapling.name=Scanned Sapling S:item.for.serumGE.with.ScannedSerum.name=Scanned Serum ```
2021-01-25fix(gregtech): tile itemblock bottom side rendering (#421)Léa Gris
Bottom side of itemblock tiles was not rendered.
2021-01-25Drillers correctly reuse old mining pipesrepo_alt
2021-01-24Fixed item meter cover for non-quantum chests. Didn't notice that _all_ GT ↵repo_alt
tiles are marked as "digital chest"
2021-01-24Merge branch 'experimental' of ↵repo_alt
https://github.com/GTNewHorizons/GT5-Unofficial into experimental
2021-01-21Make sure the onServerTick event is actually called.Jason Mitchell
2021-01-19ME output busrepo_alt
2021-01-19Merge pull request #414 from ↵Martin Robertz
GTNewHorizons/maybe_fix_cme_in_machine_update_thread Do some locking around getTileEntity to avoid CMEs on the main thread
2021-01-18add comment as to onServerTick vs onWorldTickJason Mitchell
2021-01-18try/finallyJason Mitchell
2021-01-18Hashmap insteadJason Mitchell
2021-01-18Less silly getBurnTime()Jason Mitchell
2021-01-18Include getBlock and getBlockMetadata in the lockJason Mitchell