Syncing from original. #1
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Prevent extruder from consuming wire mold
In multiplayer players can teleport to "restricted" areas (like closed dimensions or WorldEdit regions), need to handle it.
Added config for removal of shapless recipes for storage blocks
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.
Fixed IC2C compile issue. Fixed Radiation effect using a statc potion ID. Removed IE, Magneticraft, TiCon and Translocators as compile requirements.
Now addons can register their machines for PA support.
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
```
better handling of Empty CamelCased DisplayName
New ID reservation
Fixed adjustable transformer gui bug & adjusted buffer
Additional input bus mode
Added BartWorks integration for BasicMachine recipes
Added Scanner requirement to NEI for Assembly Line recipes.
Fixed overlap with GT++ Texture range
Fixed GT5 Build process. Made some dependencies optional via use of reflection. Made GT use the IC2 radiotation ID instead of it being hardcoded.
feature(i18n): itemlist withname locale
Added a better way for the Processing Array to handle recipes. Now addons can register machines to the PA.
Fixed Power injection for Multiblocks.
Added Gradle Wrapper to workspace. Satisfies users who couldn't figure it out themselves during #1550.
…d this in the web editor?
Fix a derp.
fix #1545 GT_MachineRecipeLoader run() method too big
Made Volumetric Flasks more flexible.
…ccessed reflectively.
Fixed missing annotation. Prevents crashing Server Side if class is accessed reflectively.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.