Commit graph

1788 commits

Author SHA1 Message Date
Alkalus
9faefc7109 Bumped Version to 5.09.33 2020-05-27 12:31:27 +01:00
Alkalus
45373ba847 Fixed missing annotation, prevents crashing Server Side if class is accessed reflectively. 2020-05-27 12:21:42 +01:00
Alkalus
016ea4675e Made Volumetric Flasks more flexible. 2020-05-26 19:19:15 +01:00
Alkalus
2f5bf6eda1
Merge pull request #1546 from leagris/fix-1545
fix #1545 GT_MachineRecipeLoader run() method too big
2020-05-24 14:31:29 +01:00
Alkalus
540a83857e
Merge pull request #1560 from draknyte1/Fix-Barts-PR
Fix a derp.
2020-04-07 11:47:44 +01:00
Alkalus
c3744695d5 Added a missing bracket & missing imports. I assume @bartimaeusnek did this in the web editor? 2020-04-07 11:46:28 +01:00
Alkalus
9ccbc36ec4
Merge pull request #1559 from draknyte1/Minor-Fixes
Added Gradle Wrapper to workspace.
Satisfies users who couldn't figure it out themselves during #1550.
2020-04-07 11:41:00 +01:00
Alkalus
cf9e662a16 Added Gradle Wrapper to workspace. 2020-04-07 11:35:04 +01:00
Alkalus
628cff9b3a
Merge pull request #1548 from draknyte1/Fix-Multi-Power-Injection
Fixed Power injection for Multiblocks.
2020-04-06 21:51:16 +01:00
Alkalus
e9ac987f04
Merge pull request #1551 from draknyte1/Fix-Shitty-PA-Handling
Added a better way for the Processing Array to handle recipes.
Now addons can register machines to the PA.
2020-04-06 21:50:46 +01:00
Alkalus
9a533aa074 Avoid caching the same recipe map more than once. 2020-04-06 21:49:53 +01:00
Alkalus
2f813f77d2
Merge pull request #1552 from leagris/patch-3
feature(i18n): itemlist withname locale
2020-04-06 21:47:38 +01:00
Alkalus
2ee9d15321
Merge pull request #1550 from draknyte1/Fix-Build-Process
Fixed GT5 Build process.
Made some dependencies optional via use of reflection.
Made GT use the IC2 radiotation ID instead of it being hardcoded.
2020-04-06 21:45:16 +01:00
Alkalus
f69f11f642
Merge pull request #1558 from Blood-Asp/draknyte1-patch-texturerange
Fixed overlap with GT++ Texture range
2020-04-06 21:41:58 +01:00
Alkalus
64575bc90e
Merge pull request #1549 from draknyte1/Fix-Scanner-NEI
Added Scanner requirement to NEI for Assembly Line recipes.
2020-04-06 21:41:51 +01:00
Alkalus
34ab089c59
Merge pull request #1541 from bartimaeusnek/patch-2
Added BartWorks integration for BasicMachine recipes
2020-04-06 21:41:37 +01:00
Alkalus
2612d1c19a
Merge pull request #1504 from Dimach/hatchMode
Additional input bus mode
2020-04-06 21:41:17 +01:00
Alkalus
a2e706f305
Merge pull request #1537 from AndreySolodovnikov/AdvTransFix
Fixed adjustable transformer gui bug & adjusted buffer
2020-04-06 21:41:07 +01:00
Alkalus
2bd3aa36e7
Merge pull request #1543 from kekzdealer/patch-1
New ID reservation
2020-04-06 21:40:28 +01:00
Alkalus
f207774889
Fixed overlap with GT++ Texture range 2020-04-06 21:31:06 +01:00
Léa Gris
cb147fb3da
Update ItemList.java
better handling of Empty CamelCased DisplayName
2019-12-26 02:04:01 +01:00
Léa Gris
e5341f7cc7
feature(i18n): itemlist withname locale
Automatically generate entries in `Gregtech.lang` for items with custom names (mostly used for recipes display in NEI).

Additional entries generated:

```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.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.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: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.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.DuplicatedSeedsChanceEqualsEfficiency.name=Duplicated seeds; Chance equals efficiency
    S:ic2.crop.invalid.with.InstanceSeedsToDuplicateDoesNotGetConsumedInProgress.name=Instance seeds to duplicate(does not get consumed in progress)
    S:ic2.crop.invalid.with.ScannedSeeds.name=Scanned Seeds
    S:ic2.crop.invalid.with.duplicatedSeedsChanceEqualsEfficiency.name=Duplicated seeds; Chance equals efficiency
    S:ic2.crop.invalid.with.instanceSeedsToDuplicateDoesNotGetConsumedInProgress.name=Instance seeds to duplicate(does not get consumed in progress)
    S:ic2.crop.invalid.with.scannedSeeds.name=Scanned Seeds
    S:item.for.beeDroneGE.with.ScannedDrone.name=Scanned Drone
    S:item.for.beeDroneGE.with.scannedDrone.name=Scanned Drone
    S:item.for.beeLarvaeGE.with.ScannedLarvae.name=Scanned Larvae
    S:item.for.beeLarvaeGE.with.scannedLarvae.name=Scanned Larvae
    S:item.for.beePrincessGE.with.ScannedPrincess.name=Scanned Princess
    S:item.for.beePrincessGE.with.scannedPrincess.name=Scanned Princess
    S:item.for.beeQueenGE.with.ScannedQueen.name=Scanned Queen
    S:item.for.beeQueenGE.with.scannedQueen.name=Scanned Queen
    S:item.for.butterflyGE.with.ScannedButterfly.name=Scanned Butterfly
    S:item.for.butterflyGE.with.scannedButterfly.name=Scanned Butterfly
    S:item.for.caterpillarGE.with.ScannedCaterpillar.name=Scanned Caterpillar
    S:item.for.caterpillarGE.with.scannedCaterpillar.name=Scanned Caterpillar
    S:item.for.pollenFertile.with.ScannedPollen.name=Scanned Pollen
    S:item.for.pollenFertile.with.scannedPollen.name=Scanned Pollen
    S:item.for.sapling.with.ScannedSapling.name=Scanned Sapling
    S:item.for.sapling.with.scannedSapling.name=Scanned Sapling
    S:item.for.serumGE.with.ScannedSerum.name=Scanned Serum
    S:item.for.serumGE.with.scannedSerum.name=Scanned Serum
lea@meumeu:~/ATL/instances/BRDEV$ egrep --extended-regexp '\.with\.[[:upper:]]' GregTech.lang 
    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.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.DuplicatedSeedsChanceEqualsEfficiency.name=Duplicated seeds; Chance equals efficiency
    S:ic2.crop.invalid.with.InstanceSeedsToDuplicateDoesNotGetConsumedInProgress.name=Instance seeds to duplicate(does not get consumed in progress)
    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
```
2019-12-25 17:50:46 +01:00
Alkalus
e4f8398a92 Fixed minor oversight in range check. 2019-12-13 18:07:38 +00:00
Alkalus
b96b301456 Tidied PR up a little bit. 2019-12-13 17:57:00 +00:00
Alkalus
3a9e389bc6 Added a better way for the Processing Array to handle recipes.
Now addons can register their machines for PA support.
2019-12-13 17:53:13 +00:00
Alkalus
be8b163c83 Fixed Build Script.
Fixed IC2C compile issue.
Fixed Radiation effect using a statc potion ID.
Removed IE, Magneticraft, TiCon and Translocators as compile requirements.
2019-12-13 17:13:17 +00:00
Alkalus
8d6e7b6974 Added Scanner requirement to NEI for Assembly Line recipes. 2019-12-13 16:54:39 +00:00
Alkalus
11ba5e8594 Fixed Power injection for Multiblocks.
All Energy Producing Multis will explode if they cannot handle the output load.
All Energy Producing Multis also now support multi amp dynamo hatches, which may be added by addons.
2019-12-13 14:32:37 +00:00
Léa Gris
fcf519d0b1
fix 1545 GT_MachineRecipeLoader run() method too big
Move excess code from run() to chained run2()
2019-11-16 19:08:58 +01:00
kekzdealer
06fbecf0f7
New ID reservation
I would like to use this range for my mod KekzTech :)
2019-10-11 00:45:06 +02:00
bartimaeusnek
17cdc828c1
Update GT_MetaTileEntity_BasicMachine_GT_Recipe.java 2019-09-05 07:04:44 +02:00
bartimaeusnek
3536009906
Update GT_MetaTileEntity_BasicMachine_GT_Recipe.java 2019-09-04 03:21:38 +02:00
bartimaeusnek
4771071926
Update GT_MetaTileEntity_BasicMachine_GT_Recipe.java 2019-09-04 02:58:57 +02:00
Dimach
81354d1ef3 Changed description and optimized code. 2019-06-21 02:49:54 +03:00
Andrey Solodovnikov
7394cf9d14 Adjusted Adv Transormer buffer 2019-06-20 00:01:25 +03:00
Andrey Solodovnikov
4e7734a714 Fixed difital transformer gui bug 2019-06-19 23:01:12 +03:00
AndreySolodovnikov
121b19fa2e
Merge pull request #1 from Blood-Asp/unstable
Merge
2019-06-19 22:57:54 +03:00
Zickfor
7b592a645c fixed teleporter bug with dragon egg and nitrogen plasma (#1536) 2019-06-16 23:37:24 +02:00
AndreySolodovnikov
18907fdbab fixed OR bug (#1535) 2019-06-16 23:36:30 +02:00
AndreySolodovnikov
31fc5f9aeb added hard radon recipe and config for it (#1534) 2019-06-16 23:35:12 +02:00
AndreySolodovnikov
9a94c84d78 Added zincite Carbothermic Reduction recipe to electric blast furnace (#1533) 2019-06-16 23:34:01 +02:00
Blood Asp
759fdf458e update image 2019-06-16 23:33:15 +02:00
AndreySolodovnikov
3a6581c065 Screen cover pr (#1532)
* Improved LuV+conveyor modules

now LuV+ Conveyors can work with more than 1 stack per tick

* Fixed conveyors

* added new screen cover crecipe
2019-06-16 23:09:13 +02:00
AndreySolodovnikov
aa577dd469 Added some fixes for old bugs (#1529)
* Improved LuV+conveyor modules

now LuV+ Conveyors can work with more than 1 stack per tick

* Fixed conveyors

* Fixed AL books at servers

Added a fix for unlocalized item names in AL books at minecraft servers

* Fixed automaintance hatch

Automaintance hatches cannot be used for automainting if they allow to put in any items. This fix changes this, now automaintance hatches can hold only 1 stack of each needed for maintating item

* Fix for LV and HV circuits

fixed old bug when LV and HV circuits cannot be automatically put in any machines

* Revert "Fixed conveyors"

This reverts commit 467563b8c92502247ab3d5cad9165cbe77e0b998.

* Revert "Improved LuV+conveyor modules"

This reverts commit 4dc2e2124c85e336461e58a11b3cf9c7222cca16.

* Update GT_MetaTileEntity_BasicMachine_GT_Recipe.java

* Deleted GC schematics from scanner code

now this is the port of NH fork fix
2019-06-16 23:08:15 +02:00
Dimach
25d4422588 Port digital transformers by Spartak (#1511)
* Add Digital Transformer

* Digital transformer port and refactor.
2019-06-16 23:05:33 +02:00
Blood Asp
49137e7632 More fixes 2019-04-28 19:30:56 +02:00
Blood Asp
ae88beaaa7 Formatting fix 2019-04-28 19:13:13 +02:00
AndreySolodovnikov
f26e2c446a Added an Advanced Processing Array (#1528)
* Improved LuV+conveyor modules

now LuV+ Conveyors can work with more than 1 stack per tick

* Revert "Improved LuV+conveyor modules"

This reverts commit 4dc2e2124c85e336461e58a11b3cf9c7222cca16.

* Added Advanced an processing array

Like simple array, but handles 64 machines and is 5x5x5

* Fixed PA

deletede confid, used blockCasings8

* PA fixes

now it works fine
2019-04-28 19:05:10 +02:00
AndreySolodovnikov
65adcbc9b0 Added organic replicator (#1530)
* Improved LuV+conveyor modules

now LuV+ Conveyors can work with more than 1 stack per tick

* Fixed conveyors

* Revert "Fixed conveyors"

This reverts commit 467563b8c92502247ab3d5cad9165cbe77e0b998.

* Revert "Improved LuV+conveyor modules"

This reverts commit 4dc2e2124c85e336461e58a11b3cf9c7222cca16.

* Added organic replicator

Added new machine for duplicating seeds
2019-04-28 19:04:21 +02:00
AndreySolodovnikov
aa159dc67b Improved LuV+conveyor modules (#1527)
* Improved LuV+conveyor modules

now LuV+ Conveyors can work with more than 1 stack per tick

* Fixed conveyors
2019-04-28 19:01:09 +02:00