| Age | Commit message (Collapse) | Author |
|---|
|
This reverts commit 4159f36223a936528f43eaa4439281478a4314c2.
|
|
This reverts commit dafbaf22fd6bef1112143b80d35eae9c60880dfc.
|
|
|
|
* basic work
* typo fixes
* make an enum folder
* location enums
* space project manager
* implement the space project teams
* commands
* move things around and new things
* upgrade work
* requirement work
* if possible use an upgrades values
* cleanup
* more helpers in command
* fix AOOBE
* fix world saved data
* builder for requirements
* add command autocomplete
* fix command npe
* mark world saved data dirty
* switch to saving to json string. this is fine
* fix npe
* fix files not saving correctly. serialization
* spotless
* part 1 of fixing json saving
* working json file saving
* rename fields
* full implementation of SP_Upgrade
* fixes
* cleanup
* texture prep
* documentation part 1
* documentation part 2 and rework of json saving
* fix the missed conversions
* set texture when copying
* more interface usage and fixes
* rework saving.
* Added rudimentary NEI handler for projects
* Revert "Added rudimentary NEI handler for projects"
This reverts commit 6d8210e25b27fee7dc1865d1afa91708a8d9b875.
* address NPEs
* some textures
* higher quality textures, put in the moon as a temp texture
* add a check to create a team if one smt weird happens
* command work
* add ability to localize the space bodies
* Added disabled button and toggle button
* Added possibility to not render the original stacksize of item stacks in NEI
* Added NEI handler
* Fixes item count on tooltip always rendering as 1
* Fix refactor
* 5 new body textures
* fix misspelled texture name
---------
Co-authored-by: minecraft7771 <maxim235@gmx.de>
|
|
* Make material renderer available for arbitrary item
* pass render pass
|
|
* Add Hodgepodge compat
* cleanup
* Fix for fluid inside large cell
|
|
* New texture
* Blade
* Change molten space and time names.
* Update fluid names
* Bump dep of AE2
---------
Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
|
|
* Update buildscript, add all recently added gradle.properties entries
* Dependency version bumps and cleanup
* Bump eternal singularity version
* Update buildscript
* Make AE2 a required dependency
* Switch version to class generation from token replacement
|
|
* Remove warning suppression
* New helper default method
* Initial work on TPM
* Bump dep for structure lib and modular UI
* Structure works + recipe map
* Working
* Tooltip and NEI work
* Change controller texture
* spotlessApply (#1719)
* Fix wrong order
* Add override
* Spotless
* Big opps lol
* Comment
* Spotless
---------
Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
|
|
|
|
* Inf renderer working + fuzzy halo on cosmic neutronium.
* Helper method
* Cosmic nt nearly done
* Glitch renderer
* Working!
* Add comment
* Cosmic Nt finished
* Cosmic render appears
* Universium Renderer nearly done
* New material universium
* Dep
* Dep
* Universium
* Some more changes
* Spotless apply for branch RenderingMaterials for #1592 (#1593)
* Fix Battery Buffer accepting more than 1 items per slot (#1590)
* Unify sodium persulfate amount (#1591)
Modify recipes added in https://github.com/GTNewHorizons/GT5-Unofficial/pull/1063 to use 100L sodium persulfate instead of 500L. 100L is what the other recipes use, so this makes the amounts consistent.
See https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/11842#issuecomment-1364870167 for context
* spotlessApply
Co-authored-by: miozune <miozune@gmail.com>
Co-authored-by: D-Cysteine <54219287+D-Cysteine@users.noreply.github.com>
Co-authored-by: Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com>
Co-authored-by: GitHub GTNH Actions <>
* Better textures for universium maybe?
* Fixed cosmic Nt
* Remove glitch renderer (not used)
* Rename universium renderer
* Rename universium renderer
* Change Colour to Color (begrudgingly)
* Gray infinity halo
* Remove halo
* Fix off axis rotation on dropped universium and some new textures
* More universium stuff
* Cell render works
* Inf render
* Working inf
* Universium done but no fluid outside of cells rendering
* Fluid rendering
* Comment
* Spotless apply for branch RenderingMaterials for #1592 (#1634)
* Fix Battery Buffer accepting more than 1 items per slot (#1590)
* Unify sodium persulfate amount (#1591)
Modify recipes added in https://github.com/GTNewHorizons/GT5-Unofficial/pull/1063 to use 100L sodium persulfate instead of 500L. 100L is what the other recipes use, so this makes the amounts consistent.
See https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/11842#issuecomment-1364870167 for context
* fix it (#1597)
* Fix tooltip for required input hatches (#1599)
* Allow resource packs to override individual progressbar textures (#1596)
* Allow resource packs to override individual progressbar textures
* spell: every + singular
* Fix potential crash on server with FallbackableSteamTexture
* Add colored voltage tier display for Waila (#1598)
* Add colored voltage tier display for Waila
* Adapt to new methods
* fix oredict name (#1600)
Fix wrong oredict for blizz comb
* fix it (#1601)
* adds molds and recipe generation (#1603)
* Delete water from recipe (#1604)
* Added Shortcut because simply dull (#1594)
* Added Shortcut because simply dull
* I always forget to remove a dep
* Increase Recipe Time
To fit the original recipe chain
* spotless :(
* Upped the recipe to ZPM
and increased educt/product side by 16
* make sugar maceration recipe shorter (#1586)
* make sugar maceration recipe shorter
(cherry picked from commit 55d85dc6ab315da3eb31e41667317e127a2059fe)
* spotlessApply (#1587)
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Co-authored-by: GitHub GTNH Actions <>
* fix reed to sugar recipe
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
* Add light, medium and heavy oil to get lube (#1584)
* Add light, medium and heavy oil to get lube
Add distillation recipe to get lube out of oil
add control circuit
* spotlessApply (#1585)
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Co-authored-by: GitHub GTNH Actions <>
* fix misstype
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
* remove autogenerated SiSG ebf recipe (#1588)
(cherry picked from commit 4d3052e50b7de739c89c339d37a24297f3bb70fc)
* Remove void break from fluid tanks and chests (#1602)
* Remove void break from fluid tanks
Previously, sneaking while breaking a fluid tank would void the contents of the tank, leading to potential loss of valuable resources. However, this behavior is not consistent with other blocks, such as chests and furnaces, which retain their contents when broken while sneaking.
This commit removes the sneak breaking voiding behavior for fluid tanks, bringing them in line with other blocks and reducing the risk of unintended loss for players.
* run spotless
* fix stray check for voidBreak
Signed-off-by: NexusNull <p.wellershaus@googlemail.com>
* remove override
Signed-off-by: NexusNull <p.wellershaus@googlemail.com>
* remove void tooltip
Signed-off-by: NexusNull <p.wellershaus@googlemail.com>
Signed-off-by: NexusNull <p.wellershaus@googlemail.com>
* fix (#1605)
* Fix inconsistency in naming (#1606)
* Add a way to remove a furnace recipe using the output instead of input (#1609)
* add method
* change method to remove all recipes with said output
* Naphthenic acid (#1589)
* add burn value for NaphthenicAcid 60k in Semi Fluid generator
(cherry picked from commit 3fa145932b64025067e807f4ff900f51029d07bd)
* add Naphthenic acid recipes and change a few
(cherry picked from commit 8b6b6d72dd79b4549dccd3732ccca6e219dd8ce7)
* spotless
* fix error
(cherry picked from commit db7b322cece6cf151f92ab6aa467bc8e4c84bda8)
* Chemical balance fixes
Co-authored-by: Pxx500 <81298696+Pxx500@users.noreply.github.com>
* Fix plasma turbine EU output (#1607)
* Revert "Turbine efficiency helper (#1562)"
This reverts commit 3c852a0143cbfa864da59bdd0b2edab1fa4bf146.
* Restore efficiency helper
* Spotless
Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
* disable auto recipe (#1611)
* possible fix (#1614)
https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/12139
(cherry picked from commit 64f7433f2fab2eff618bb25997c303516fdab3f8)
* Add Failsafe for getCasingTextureForId to prevent null page. (#1612)
* Improve NEI customizability (#1583)
* Move descriptions to recipemap
* Move tooltips to recipemap
* Move overlays to recipemap
* Use shared code for generating grid positions
* 2 fluid inputs for freezer recipes
* Add deprecation javadoc
* Fix (#1616)
Allows players to use any rubber instead of just one. As other tiers have that.
* Heating element change (#1618)
* Changed (sg) to * instead (#1620)
* add transcendant metal pipe and multiple pipe (#1619)
* fix drills not generating and using less material (#1623)
* fix LV steam valve (#1624)
* TungSteel to TPV (#1622)
* fix waila displaying wrong generated eu/t (#1621)
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
* Add a Overclock Calculator for multis and the like to use (#1617)
* add calculator and unit tests
* use math.ceil
* math.ceil everywhere
* add some more unit tests and add onetick discount possibility
* add an exception when trying to get the consumption before calculating
* spotless oops
* convert PCB Factory to use the OC calculator
* fix tests trying for wrong values
* fix copy paste error
* address reviews
* this should be there too.
* add callhook for pre block destroy (#1625)
* add callhook for pre block destroy
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
* spotless
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
* Change Tungstensteel to Require TPV Coils (#1628)
* Fix Blue Steel and Bismuth Bronze mixing (#1629)
* blue steel
* bismuth bronze
* Add new Weed-EX 9000 (#1615)
* Add new Weed-EX
* Add more pollen
* Change material ID
* Remove fluid recipes
* Remove pollen
* Remove cells
* Balance adjustment for the LCR Nitrobenzene recipe. (#1631)
* nitrobenzene balance
* SA
* zpm instead
* force compound to be grouped together in chemical formula (#1630)
* force compound to be grouped together in chemical formula
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
* patch up glass chemical formula
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
* merge two toString
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
* Allow overriding more progressbar textures & Add document for resource packs (#1632)
* spotlessApply
Signed-off-by: NexusNull <p.wellershaus@googlemail.com>
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
Co-authored-by: miozune <miozune@gmail.com>
Co-authored-by: D-Cysteine <54219287+D-Cysteine@users.noreply.github.com>
Co-authored-by: BlueWeabo <76872108+BlueWeabo@users.noreply.github.com>
Co-authored-by: MadMan310 <66886359+MadMan310@users.noreply.github.com>
Co-authored-by: Runakai1 <48415331+Runakai1@users.noreply.github.com>
Co-authored-by: Pxx500 <81298696+Pxx500@users.noreply.github.com>
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: NexusNull <p.wellershaus@googlemail.com>
Co-authored-by: LewisSaber <39595617+LewisSaber@users.noreply.github.com>
Co-authored-by: Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com>
Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
Co-authored-by: chochem <40274384+chochem@users.noreply.github.com>
Co-authored-by: Phineasor <80113803+Phineasor@users.noreply.github.com>
Co-authored-by: Ethryan <dborrfors@gmail.com>
Co-authored-by: RIONDY 'POPlol333' Adam <76914762+POPlol333@users.noreply.github.com>
Co-authored-by: Glease <4586901+Glease@users.noreply.github.com>
Co-authored-by: Steelux <70096037+Steelux8@users.noreply.github.com>
Co-authored-by: Jakub <53441451+kuba6000@users.noreply.github.com>
Co-authored-by: GitHub GTNH Actions <>
* Comment
* Glee8e
* Spotless
* fix
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
* Weird error
* Spotless
* Material ID
* Universium fluid working
* Fix some inf renderer issues
* Remove try catch
* Cosmic neutronium fixes, but no fluid rendering yet.
* Working
* Spotless...
* Fake frame
---------
Signed-off-by: NexusNull <p.wellershaus@googlemail.com>
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: miozune <miozune@gmail.com>
Co-authored-by: D-Cysteine <54219287+D-Cysteine@users.noreply.github.com>
Co-authored-by: BlueWeabo <76872108+BlueWeabo@users.noreply.github.com>
Co-authored-by: MadMan310 <66886359+MadMan310@users.noreply.github.com>
Co-authored-by: Runakai1 <48415331+Runakai1@users.noreply.github.com>
Co-authored-by: Pxx500 <81298696+Pxx500@users.noreply.github.com>
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Co-authored-by: NexusNull <p.wellershaus@googlemail.com>
Co-authored-by: LewisSaber <39595617+LewisSaber@users.noreply.github.com>
Co-authored-by: chochem <40274384+chochem@users.noreply.github.com>
Co-authored-by: Phineasor <80113803+Phineasor@users.noreply.github.com>
Co-authored-by: Ethryan <dborrfors@gmail.com>
Co-authored-by: RIONDY 'POPlol333' Adam <76914762+POPlol333@users.noreply.github.com>
Co-authored-by: Glease <4586901+Glease@users.noreply.github.com>
Co-authored-by: Steelux <70096037+Steelux8@users.noreply.github.com>
Co-authored-by: Jakub <53441451+kuba6000@users.noreply.github.com>
|
|
* MTE Inventory updates
* Separate Input/Output inventory
* Use a LinkedHashMap to ensure inventory orders are deterministic
* Input/Output work on either Input/Output inventories
* MTE Inventory
* Add GT_Packet_MultiTileEntity
* More dyanmic packet with packetFeatures
* Add IMTE_HasModes for MultiBlockPart
* Help with MTE Inventory (#1613)
* convert inventory to use ItemStackHandler
* Update MUI
* inventories
* move Iteminventory to its own method
Co-authored-by: miozune <miozune@gmail.com>
* Update MUI
* Update MUI
* Add IMultiBlockPart
* Mte fluid inventory (#1639)
* first work on fluid inventory
* make gui work with numbers not dividable by 4
* use math.min
* add outputfluids saving
* actually working
* Update MUI
Co-authored-by: miozune <miozune@gmail.com>
* Ticking Covers!
* Parts now register covers with the controller
* Controllers now tick covers on parts
* Break cover ticking out into `tickCoverAtSide`
Fix some inventory methods on MultiBlockController
* Filter on tickable covers
* Improve GUIs for MTEs (#1650)
* working controller GUI
* locked inventory selection work
* input and output locking of inventories
Co-authored-by: miozune <miozune@gmail.com>
* spotless
* CoverInfo refactor (#1654)
* Add `CoverInfo` and deprecate the old fields to hold cover information
* Disable MTE registration
* Fix NPE - Return EMPTY_INFO for SIDE_UNKNOWN
Temporarily add back old NBT saving in case of a revert so covers aren't lost.
* Actually save the old NBT data, instead of empty
Co-authored-by: BlueWeabo <76872108+BlueWeabo@users.noreply.github.com>
Co-authored-by: miozune <miozune@gmail.com>
|
|
* Allow resource packs to override individual progressbar textures
* spell: every + singular
* Fix potential crash on server with FallbackableSteamTexture
|
|
* Update build.gradle
* Extract tooltip animation to API
* Use GTNHLib
* Delete AnimatedTooltipHandler.java
|
|
* Make ModularUI a transitive dependency
* Update MUI
|
|
* Base work for ModularUI compat
* Remove useless interface
* Add almost all the widgets
* Invert method
* Refactor NEI stack placement positions
* NEI handlers on ModularUI
* Add some more docs
* AdvDebugStructureWriter
* Fix NEI progressbar not working
* PrimitiveBlastFurnace
* clean
* derp
* clean
* spotlessApply
* Boilers
* Buffers
* clean
* N by N slots containers
* Fix boilers not having bucket interaction
Put opening UI to individual MetaTEs
* Maintenance Hatch
* clean
* spotlessApply
* Add dependency
* IndustrialApiary
* Adapt to ModularUI change
* Base work for covers & fix crash with MP
* Fix crash with server
* Rewrite base work for covers
* Send initial cover data on cover GUI open
so that the time of showing incorrect data will be eliminated
* Covers part 1
* Rename package: ModularUI -> modularui
* Rename class: GT_UIInfo -> GT_UIInfos
* Fix build
* Covers part2
* Fix missing client check with tile UI & fix title overlap
* CoverTabLine
* Move cover window creators to inner class
* Fix crash with null base TE
* Close GUI when tile is broken
* Color cover window with tile colorization
* Change signature of addUIWidgets
* FluidFilter cover, FluidDisplaySlotWidget, BasicTank, BasicGenerator, Output Hatch, MicrowaveEnergyTransmitter, Teleporter, DigitalChest, DigitalTank
* Add title tab
* Move package: modularui -> modularui/widget
* Programmed circuit + IConfigurationCircuitSupport
* clean
* VolumetricFlask
* Remove integrated circuit overlay from recipe input slots
* Input Hatch & Quadruple Input Hatch
* Multiblock
* Deprecate old cover GUI
* BasicMachines
* Finish BasicMachine & NEI
* Expand DTPF NEI to 9 slots
* Fix ME input bus on MP
* Move AESlotWidget to public class
* Move GT_Recipe_Map constructors with mNEIUnificateOutput to setter method
* Move SteamTexture.Variant to outer enum
* Switch to remote repository
* oops
* Update MUI
* Update MUI
* Minor refactor for change amount buttons
* Display items and fluids that exceed usual count
* blah
* use +=, why didn't I do this
* Update MUI
* Move ModularUI to Base (#1510)
* Move ModularUI to Base
* Move most of the ModularUI functionality to `BaseTileEntity` (and `CoverableTileEntity`)
* `CommonMetaTileEntity` delegates ato the MetaTileEntity
* Added several interfaces (with defaults) to indicate if a tile/metatile override/implement certain behaviors.
* Moved `IConfigurationCircuitSupport` interface such that it will work with BaseTileEntity or a MetaTileEntity
* Address reviews
Co-authored-by: miozune <miozune@gmail.com>
* Update MUI
* Minor changes to NEI
* Return :facepalm:
* IGetTabIconSet override
* Some more changes to NEI
* Merge texture getter interfaces to new class GUITextureSet
* Remove BBF structure picture as it's auto-buildable now
* Make unified title tab style of texture angular
* Expose some boiler texture getters for addon
* Fix crash with cover GUI on pipe
* Lower the number of recipe per page for DTPF & update MUI
* Update MUI
* Fix crash with middle-clicking slot on circuit selection GUI
* Fix circuit selection window not syncing item from base machine
* Merge GT_NEI_AssLineHandler into GT_NEI_DefaultHandler
* Update MUI
* Add in TecTech multi message
* Allow changing the way of binding player inventory
* Update MUI
* Update MUI
* Update MUI
* Update MUI
* Update MUI
* Make MUI non-transitive to allow addons to use their own version
* Force enable mixin
* Format fluid amount tooltip
* Add GUITextureSet.STEAM
* Add guard against null ModularWindow creation
* Add constructors for Muffler Hatch with inventory
* Fix output slot on digital chest and tank allowing insertion
* Don't log null ModularWindow
* Add default implementation for IHasWorldObjectAndCoords#openGUI
* Make openGTTileEntityUI accept MultiTE & cleanup
Co-authored-by: Jason Mitchell <mitchej@gmail.com>
|
|
* add PR screwdriver compat to GT screwdriver
* Spotless apply for branch feature/pr-screwdriver for #1475 (#1476)
Co-authored-by: Glease <4586901+Glease@users.noreply.github.com>
Co-authored-by: GitHub GTNH Actions <>
* make it optional
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
|
|
* Restricting Bees to MApiary + create class
* Revert Indium (wrong bee)
* SPOTLESS + new description
* Adjust chances to specialty comb
|
|
* Bump Forestry
* Interface IAlleleBeeAcceleratableEffect moved to Forestry
|
|
dependency (#1459)
* Update dependencies.gradle
* Update GT_Mod.java
* Delete Harvestcraft.java
|
|
to Gregtech (#1447)
* Update forestry
* Apply new formula (+uncap the chance)
* Yeet gendustry upgrades
* Conversion recipes
* Add upgrade frame
* Remove recipes
* Gendustry way
* Yeet gendustry
* Fix
|
|
* migrate to new survival autoplace api
* reduce type of blocks autoplace will use
this does not prevent those blocks from not being accepted into the structures though
* implement getBlocksToPlace
* fix survivalConstruct code for assline and DT
i hate variable size multi :(
* fix AIOBE
* allow disabling machine block updates on a per-thread basis
* make a sensible guess at what texture to use on server side
* spotless
* implement hologram support for bbf
* spotless
|
|
* Fix broken rebase
* Undo Materials formatting, it generates too many lines
* Dummy commit
* Missed a structurelib update
|
|
* Update dependencies
* Update buildscript, apply spotless
|
|
|
|
|
|
|
|
* switch to gson
* json loader code cleanup
|
|
* Added means of customizing GUI colors through lang file
* Color values are now stored in json file instead of the lang file
* Made json only load upon resource reload and ensured server compatibility
Co-authored-by: Martin Robertz <dream-master@gmx.net>
|
|
|
|
networks with security stations (#1217)
https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/10948
|
|
* Industrial Apiary
* Make Forestry not required.
* Add support for gendustry upgrades and lower energy demand
* Add item validation to input slots and fix battery + special slots
* Automation upgrade support and bug fixes
* Better canWork check and flower detection
* GUI work
* Better detection of modifier update
* Add button to cancel process
* Add textures
* Tooltip changes
* Add convert crafting
* Make top and sides glow
* Bug fix
* New textures
* Add bee effects
* Make all tooltips translatable
* Implement GT Apiary Upgrades
* Prevent inserting too many upgrades
* Just require gendustry instead of checking it everywhere
* Add blacklist (bug fix) and use hashsets instead of arrays
* Cache beemember to do effects
* Make blacklist automatic
* Add acceleration upgrades for all tiers (LV -> UV)
* Lock the machine to maxspeed by default
* Correct required energy in info tooltip
* Use isUpgrade method instead of manually checking
* Lower amperage to 4
* Save locked speed to nbt
|
|
|
|
|
|
|
|
* add first recipes for Kevlar Line
* merge conflict
* add more materials and recipes for kevlar line
* fix butanol naming
(cherry picked from commit 808c91e2904314f67085c8cce2d579d6ac711bbb)
* fix more Kevlar recipes
(cherry picked from commit 3688dda0a8d4cd79edd76072d04a59fe4e8b3ca4)
* fix more recipes
(cherry picked from commit a527b22bd815629372c8dca98e579628b1128d46)
* add more Kevlar stuff
* add more materials for Kevlar Line
* add more Materials and recipes for Kevlar
(cherry picked from commit 448083f5c1789cd78cc1dc049c859c3bec4c2485)
* Merge branch 'Kevlar' into dev
# Conflicts:
# src/main/java/gregtech/api/enums/Materials.java
* add second maven from ic2
* overseen
* add more kevlar materials and recipes
* fix naming
* fix metal block 9 was not set
* fix materials and names
(cherry picked from commit 3119d83ba53f43de6163de3f01edd6081f318cd6)
* Fix Acetylen Material
(cherry picked from commit d379365de519c503a78f68ce5ab2a3de02ff7852)
* fix recipes
(cherry picked from commit 2e2033773e1aa92224932fc93aaadaeacb83e8ba)
* remove Calcium Hydroxide Formula
* add ALF3
* make Nitrochlorobenzene backwards compatible
fix a lot of recipes
(cherry picked from commit ca2a59db88f036649f6d8ff4b5e5565c9da400c9)
* add more Kevlar materials
fix recipes
remove Nitrobenzene 3 and 4
* remove 2 Buten 1,4 Diol
fix recipes
(cherry picked from commit 811549dc9f4f73e77752d5faef2b6d7243e6e625)
* add spinnert Item, Woven and fiber kevlar
add more materials
add more recipes
* fix derp
(cherry picked from commit dc1e24753c39c70ad262f7bc2ce70d839a655942)
* fix materials id derp
(cherry picked from commit c7ba51ad846ae466054fb5e002fa8c634e3dfcad)
* fix recipes
(cherry picked from commit f8e6e32acaee563d3683b79980459bc464c6e716)
* fix more recipe
add Kevlar material
add fiber and woven kevlar recipes
(cherry picked from commit cc99809ea80f616ffe5c22e0d3f189a7b5cd7bdb)
* add Spinneret recipe
(cherry picked from commit 4db8497380b39edda8a00964613eae3a72cebbcb)
* add Bromine
add Liquid Kevlar Texture
fix recipe
add more Kevlar Materials
(cherry picked from commit e2f96cb825f5ededaff3989b7e087b51b57a913c)
* Fix recipes
(cherry picked from commit e4f8d0d33f81f94124b733cbeb975ca0b4a33da2)
* fix recipes
(cherry picked from commit 7c6b7cdd0fd0720f58993faeaa81dd95d1b3757c)
* Add more Kevlar recipes
add more Materials
(cherry picked from commit 9c35ca47e917fb2ac082ba5077e65001a7ab074a)
* add more Materials
(cherry picked from commit 12c598fe8784198c996eda3d5e072b829cf33ab8)
* fix Kevlar recipes
add more recipes
* finish kevlar line
(cherry picked from commit 39567610956ac02d3001f68851ddeb7e5d63aed7)
* fix a few more recipes
(cherry picked from commit e28283321ce1670d6684a47c0fd3fd263da8a6cb)
* fix recipe
(cherry picked from commit df89c96bc826b321f81c1c3af521469decdcff22)
* try to add back single block distillation recipes
* stupid me :)
(cherry picked from commit 7fc6c375605d85b7cc791aa9818174a1cb2f7f59)
* fix distillation recipes
(cherry picked from commit e2351c4390b632b9e361a19ba03225c82766e455)
* fix more recipes
(cherry picked from commit 0fefb881e80659d41308dec85c59a114862aaf40)
* remove not working texture
(cherry picked from commit f70cdbf7e0138ed6cc867153693db527f04a78f8)
* fix more recipes
(cherry picked from commit 6c45aa36d4176af8f41e64a8758e31618ac56ab9)
* rename chemicals
(cherry picked from commit 4aa52352319b72bca6ec27ea65aba42bd293bb39)
* fix recipes
(cherry picked from commit 0885006add9ce78614a4a45cc8ae1d46a5b466d8)
* remove unused Kevlar Materials
(cherry picked from commit 69525c04a6505ef06e1f7cc6166aaba808b0ba26)
* add more Kevlar changes
(cherry picked from commit a16f12fe71fa65ce7706b049b5e94602cb676b37)
* change Kevlar line a bit
(cherry picked from commit b06cdb634125465e073adf1e09f1821b8794d243)
* add Rhodium as compat metal
(cherry picked from commit cfde983db03efec6d83367cbd5c13887eef6aa67)
* fix texture set
(cherry picked from commit 7f2f5508acb3613505522db98eef948c8e269892)
* add more Kevlar recipes
disable Rhodium GT dummy
(cherry picked from commit 9389fe086e9d8a4bef92115a9eef8816fdf51c43)
* fix recipes
(cherry picked from commit 7dd26f59af45619c3cf2045edfb6c38198358cb0)
* fix more recipes
(cherry picked from commit b407abebd0ce1d5351b770a729d75fb3fc7a0e87)
* fix more recipes
(cherry picked from commit f2c24ea7fe4a2dfb9a95129d9a0c4b03b70f34d5)
* fix kevlar recipes
(cherry picked from commit fb9f937b7f31ab9f3f958a0a53772c82f0d55b64)
* add chemical Formular
(cherry picked from commit 5116ee58132bb1723c318e8f2c20b52f97da3b9d)
* fix recipe
(cherry picked from commit ce10e89e059946f7020219f2a79397862272d2ab)
* fix circuit
(cherry picked from commit 0ee7d4535dab0bb1a20665160f11bdf01efd411d)
* fix most of the Kevelar recipes
retier them
remove potassium Nitrate its still Saltpeter
(cherry picked from commit 49e1eec47c4c86044ce748d96dc5a11d1db68877)
* add back Potassium Nitrate for compt reasons
(cherry picked from commit eee82dc1783d40fe4b68d87ee0da646cc4ea5262)
* fix more Kevlar recipes
(cherry picked from commit aaaf2969da671cf923f7213f71e9c8eb89091e87)
* fix name in Kevlar line
(cherry picked from commit e7a883254d2c89f289453cdcd67be5dc1fc1c53a)
* Lowered EU cost on Wood Tar
- Lowered EU/t on the Wood Tar DT recipe from 256 to 224 EU/t (value suggested by Dream). The old value is just a bit too high for an HV Semifluid Generator to power the DT with the Creosote output, which forced lower tier generators and spam.
* Removed DT Recipes and Added Alternatives
- Removed circuits in DT recipes for the HV Oil and Benzene processing;
- Added IV recipes to obtain the new chemicals for the Kevlar line (the Dimethylbenzene isomer and Naphthenic Acid), without changing the setup of players that were previously processing those for their early-mid game purposes.
* Revert "Removed DT Recipes and Added Alternatives"
This reverts commit 165ad2e4d196b5966af0fe282658f1bea3d579a9.
* Revert "Lowered EU cost on Wood Tar"
This reverts commit 420d0d5cd530d3e29164c3a9c384d4187a46495a.
* fix Copper oxide use old Material
Shift ids
add melting Point
(cherry picked from commit 488d6598513307bb4221bbb50904a32e5a0bd069)
* Update GT_Loader_Item_Block_And_Fluid.java
* MAchine REcipe code too large
Co-authored-by: Glease <4586901+Glease@users.noreply.github.com>
Co-authored-by: Steelux8 <steelux7@gmail.com>
|
|
* pin comb type id instead of depending on array ordinal
* fix up _NULL related problems
* fix out of bound
* make it private
* add some more test
|
|
* Base work adding 4 new tiers of coils.
* Remove OPV tier.
Remove nonsensical coil tier tags. (Awak = UIV, really? No thanks)
Add proper texture for Hypogen, Infinity and Eternal coils.
* Revert avaratia dep via import by Alk. If someone can implement cosmic rendering here then great but that is well beyond me.
Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
|
|
|
|
|
|
|
|
* 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>
|
|
|
|
* 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
|
|
Update deps
|
|
* initial work on facade covers
* fix colorMultiplier
also removed derp
* Clean up drop cover texture reset code
What was I thinking actually? Send a packet to reset client states?
* Fix cover display stack
|
|
|
|
|
|
|
|
|
