Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge Latest changes #1

Merged
merged 44 commits into from
Nov 5, 2017
Merged

Merge Latest changes #1

merged 44 commits into from
Nov 5, 2017

Conversation

jaskarth
Copy link
Owner

@jaskarth jaskarth commented Nov 5, 2017

No description provided.

Antifluxfield and others added 30 commits September 20, 2017 00:29
@Antifluxfield
Fix #562
c40f019 
Listen to the BlockEvent of Reinforced Glass and trigger the update check.
@Antifluxfield
Fix Oil Drill logic; rebalance EU cost
0802fdb
@Antifluxfield
Fix Ore Drill EU calculation; now Ore Drill is using DrillerBase
9d8ac82
@DEMOOH
Glass fiber recipy fix
7b6bbb6 
Prevent extruder from consuming wire mold
@Antifluxfield
Adding Fake Player for all drills and pumps
e725c45
@Antifluxfield
Update
3db38a5
@Antifluxfield
Fix wrong logic.
aef60bb
@Antifluxfield
Register Reinforced Glass as GT machine casing
3f0224f
@Antifluxfield
Fix wrong coordinate
ef41455
@Dimach
Fixed small bug - basic miner cant work using battery in inner slot.
32d4998
@Antifluxfield
Rebalance EU cost 2
4372034
@Sirse
Added TeleporterUsingEvent.
7f68c17 
In multiplayer players can teleport to "restricted" areas (like closed dimensions or WorldEdit regions), need to handle it.
@Antifluxfield
The right method to find out whether the machine should break the block.
f5abfce
@Antifluxfield
Fix unexpected recipe loading
4e9e3db
@Antifluxfield
Fix
15c86d4
@Antifluxfield
l10n improve
32cea58
@Antifluxfield
l10n improve 2
ecacfdd
@Antifluxfield
Fix overflow when charging ultimate battery
b3e0abe
@jaskarth
Fix free tin
aafc8c1
@redmage17
Configed Storage Blocks
45a2057 
Added config for removal of shapless recipes for storage blocks
@Dimach
Fixed bug - miners digs bedrock.
540ddb3
@MauveCloud
Removed oredict registration of AnyIron, AnyCopper, etc.
7a27c85
@Antifluxfield
Merge pull request #1 from Dimach/driller_fix
0f9be5a 
Fixed bug - miners digs bedrock.
@jaskarth
Revert "Fix free tin"
09cdfd2 
This reverts commit aafc8c1.
@jaskarth
Fix Saplings to Plantball
5067a6f
@jaskarth
change compressedPlantball to plantball
a86dde4
@draknyte1
Added a failsafe for invalid Modular armour components.
c4b245a
@draknyte1
Added a CONTRIBUTOR.md which elaborates on the Issue and Pull request…
7a7083b 
… creation process.

Fell free to edit this as required.
@draknyte1
Added a correct CONTRIBUTING.md, removed CONTRIBUTOR.md.
5b5ecc7
@Blood-Asp
prevent circuit conversation/tier jump
3c78346
Blood-Asp and others added 14 commits November 5, 2017 17:02
@Blood-Asp
Merge pull request #1226 from Antifluxfield/patch-1
de7195f 
Fix AssLine structure check
@Blood-Asp
Merge pull request #1228 from DEMOOH/unstable
083b6b0 
Glass fiber recipe fix
@Blood-Asp
Merge pull request #1230 from Antifluxfield/driller_fix
7982163 
Drillers fix
@Blood-Asp
Merge pull request #1232 from Dimach/unstable-1
471376d 
Fixed small bug - basic miner cant work using battery in inner slot.
@Blood-Asp
Merge pull request #1240 from Sirse/unstable
d267fc8 
Added TeleporterUsingEvent.
@Blood-Asp
Merge pull request #1249 from Antifluxfield/recipe_loading_fix
07a0e94 
Fix unexpected recipe loading
@Blood-Asp
Merge pull request #1251 from Antifluxfield/l10n_improve
e9313b5 
Localization improve
@Blood-Asp
Merge pull request #1254 from Antifluxfield/overflow_fix
c785104 
Fix overflow when charging ultimate battery
@Blood-Asp
Merge pull request #1261 from SuperCoder7979/unstable
53993d6 
Fix free tin bug by making Dimethyldichlorosilane and fix methane not outputting enough cells
@draknyte1
Small change to CONTRIBUTING.md.
042be46
@draknyte1
Merge branch 'unstable' of https://github.com/Blood-Asp/GT5-Unofficial …
e6d0d06 
…into unstable
@Blood-Asp
Merge pull request #1267 from redmage17/unstable
2a466bb 
Configed Storage Blocks
@Blood-Asp
Merge pull request #1269 from MauveCloud/unstable
ce4d0b7 
Removed oredict registration of AnyIron, AnyCopper, etc.
@Blood-Asp
Merge pull request #1271 from SuperCoder7979/Plantball-fix
d83d526 
Plantball fix
@jaskarth jaskarth merged commit c3867c6 into jaskarth:unstable Nov 5, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@jaskarth @NNM42 @Antifluxfield @DEMOOH @Dimach @Sirse @redmage17 @MauveCloud @draknyte1 @Blood-Asp