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.

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

Syncing from original. #1

Merged
merged 247 commits into from
Oct 19, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
247 commits
Select commit Hold shift + click to select a range
c40f019
Fix #562
Antifluxfield Sep 19, 2017
0802fdb
Fix Oil Drill logic; rebalance EU cost
Antifluxfield Sep 21, 2017
9d8ac82
Fix Ore Drill EU calculation; now Ore Drill is using DrillerBase
Antifluxfield Sep 21, 2017
7b6bbb6
Glass fiber recipy fix
DEMOOH Sep 21, 2017
e725c45
Adding Fake Player for all drills and pumps
Antifluxfield Sep 21, 2017
3db38a5
Update
Antifluxfield Sep 21, 2017
aef60bb
Fix wrong logic.
Antifluxfield Sep 22, 2017
3f0224f
Register Reinforced Glass as GT machine casing
Antifluxfield Sep 23, 2017
ef41455
Fix wrong coordinate
Antifluxfield Sep 24, 2017
32d4998
Fixed small bug - basic miner cant work using battery in inner slot.
Dimach Sep 25, 2017
4372034
Rebalance EU cost 2
Antifluxfield Oct 2, 2017
7f68c17
Added TeleporterUsingEvent.
Sirse Oct 5, 2017
f5abfce
The right method to find out whether the machine should break the block.
Antifluxfield Oct 7, 2017
4e9e3db
Fix unexpected recipe loading
Antifluxfield Oct 16, 2017
15c86d4
Fix
Antifluxfield Oct 18, 2017
32cea58
l10n improve
Antifluxfield Oct 19, 2017
ecacfdd
l10n improve 2
Antifluxfield Oct 19, 2017
b3e0abe
Fix overflow when charging ultimate battery
Antifluxfield Oct 20, 2017
aafc8c1
Fix free tin
jaskarth Oct 25, 2017
69fa5a3
fix free tin
jaskarth Oct 25, 2017
5300d49
fix chloroform
jaskarth Oct 25, 2017
22c2f16
GT6 styled pipe and wire connection
Antifluxfield Oct 30, 2017
f96993b
Soldering Tools for cable connection
Antifluxfield Oct 30, 2017
7b0dc97
Add Quadruple and Nonuple fluid pipes; fix several issues
Antifluxfield Oct 30, 2017
77c639c
Fix ItemPipe tick time customization
Antifluxfield Oct 30, 2017
1e8189e
Add all the Multi-pipes
Antifluxfield Oct 30, 2017
78aa11b
Another config to control wire connections, and disable them by default.
Antifluxfield Oct 30, 2017
c648ac6
Visualize fluid pipe input restriction
Antifluxfield Oct 30, 2017
f6a9bbb
Add the missing condition...
Antifluxfield Nov 1, 2017
45a2057
Configed Storage Blocks
redmage17 Nov 1, 2017
540ddb3
Fixed bug - miners digs bedrock.
Dimach Nov 2, 2017
0f9be5a
Merge pull request #1 from Dimach/driller_fix
Antifluxfield Nov 3, 2017
09cdfd2
Revert "Fix free tin"
jaskarth Nov 4, 2017
5067a6f
Fix Saplings to Plantball
jaskarth Nov 4, 2017
682069a
Fix the magic energy absorber
jaskarth Nov 4, 2017
a86dde4
change compressedPlantball to plantball
jaskarth Nov 4, 2017
5bfe5a5
Clean up code
jaskarth Nov 4, 2017
c4b245a
Added a failsafe for invalid Modular armour components.
draknyte1 Nov 5, 2017
7a7083b
Added a CONTRIBUTOR.md which elaborates on the Issue and Pull request…
draknyte1 Nov 5, 2017
5b5ecc7
Added a correct CONTRIBUTING.md, removed CONTRIBUTOR.md.
draknyte1 Nov 5, 2017
3c78346
prevent circuit conversation/tier jump
Blood-Asp Nov 5, 2017
de7195f
Merge pull request #1226 from Antifluxfield/patch-1
Blood-Asp Nov 5, 2017
083b6b0
Merge pull request #1228 from DEMOOH/unstable
Blood-Asp Nov 5, 2017
7982163
Merge pull request #1230 from Antifluxfield/driller_fix
Blood-Asp Nov 5, 2017
471376d
Merge pull request #1232 from Dimach/unstable-1
Blood-Asp Nov 5, 2017
d267fc8
Merge pull request #1240 from Sirse/unstable
Blood-Asp Nov 5, 2017
07a0e94
Merge pull request #1249 from Antifluxfield/recipe_loading_fix
Blood-Asp Nov 5, 2017
e9313b5
Merge pull request #1251 from Antifluxfield/l10n_improve
Blood-Asp Nov 5, 2017
c785104
Merge pull request #1254 from Antifluxfield/overflow_fix
Blood-Asp Nov 5, 2017
53993d6
Merge pull request #1261 from SuperCoder7979/unstable
Blood-Asp Nov 5, 2017
042be46
Small change to CONTRIBUTING.md.
draknyte1 Nov 5, 2017
e6d0d06
Merge branch 'unstable' of https://github.com/Blood-Asp/GT5-Unofficia…
draknyte1 Nov 5, 2017
2a466bb
Merge pull request #1267 from redmage17/unstable
Blood-Asp Nov 5, 2017
ce4d0b7
Merge pull request #1269 from MauveCloud/unstable
Blood-Asp Nov 5, 2017
d83d526
Merge pull request #1271 from SuperCoder7979/Plantball-fix
Blood-Asp Nov 5, 2017
8c80a05
Fix small bug with block position
jaskarth Nov 5, 2017
c3867c6
Merge pull request #1 from Blood-Asp/unstable
jaskarth Nov 5, 2017
6bc9874
Add Gasoline
jaskarth Nov 5, 2017
83bd3a0
Replace lead with toluene
jaskarth Nov 5, 2017
e18f0a1
Fix cover placing issue with such small AABB of metapipes
Antifluxfield Nov 6, 2017
f17a3ef
Remove useless import
jaskarth Nov 6, 2017
af22787
Fix missing cell
jaskarth Nov 6, 2017
5b13b53
Fix typo
jaskarth Nov 6, 2017
d30dfe7
Add ethyl tert-butyl ether and rename gasolines
jaskarth Nov 7, 2017
c74b3dc
Change Gasoline production a little bit
jaskarth Nov 7, 2017
ced4854
Try to fix the unexpected disconnection caused by those unloaded chunks
Antifluxfield Nov 8, 2017
1245f31
Fix Material Index
jaskarth Nov 8, 2017
51334d1
Draw the cross in the hint grid
Antifluxfield Nov 9, 2017
7eeab3e
Resistor recipes now accept Coal, Charcoal, and Carbon
Nov 10, 2017
f97b56f
Added a forgotten LCR Tetrafluoroethylene recipe
Nov 10, 2017
c8cbc16
Removed Cracking of unsaturated hydrocarbons, implemented alternatives
Nov 11, 2017
03491bd
Increased recipe time for cracking in a (Large) Chemical Reactor
Nov 11, 2017
e9e88db
Make the cross show which direction the pipe is connecting with
Antifluxfield Nov 13, 2017
2b8cca2
Unexpected disconnection #2
Antifluxfield Nov 13, 2017
d66f4fd
Configed Machine Casings
redmage17 Nov 13, 2017
5fbaf37
Added large diesel repair status to NC info panel.
Dimach Nov 17, 2017
a80acab
Added IntCircuit to LCR Tetrafluoroethylene recipe for consistency
Nov 21, 2017
ad59996
Reenabled Cracking for Refinery Gas
Nov 21, 2017
b87a558
Removed NEI Large boiler fuel entry for Carbon Dust (#1295)
Nov 21, 2017
b78b3af
Added recipes for Phenol production from Benzene
Nov 21, 2017
1cf109d
Oil Cracker can now also works right -> left, EU/Maint Hatches anywhere
Nov 22, 2017
a35965b
Fixed Oil Cracker description typo
Nov 22, 2017
b2374a5
The Large Chemical Reactor can now have its Cupronickel Coil on any side
Nov 22, 2017
d592d19
Fixed the collision of LCR Hypochlorous Acid recipes
Nov 22, 2017
5476c4e
Increased the yields of cracked Heavy Fuel, Light Fuel, Naphtha
Nov 23, 2017
5fc1361
Fixed a bug where restricting Output Hatches caused severe log spam (…
Nov 23, 2017
e7ea884
Merge pull request #1281 from JohannesGaessler/ForgottenTFERecipe
draknyte1 Nov 24, 2017
c7177dc
Added info to small miners tooltip. (#1287)
Dimach Nov 24, 2017
2dc5b03
Single block pump refactor & bugfix:
mitchej123 Nov 24, 2017
c7edbf1
Merge pull request #1289 from Dimach/diesel
draknyte1 Nov 24, 2017
1c9c9af
Merge pull request #1296 from JohannesGaessler/MorePhenolRecipes
draknyte1 Nov 24, 2017
dbbefaf
Merge branch 'unstable' into GT6-styled_pipes
Blood-Asp Nov 25, 2017
9ea8a85
Merge branch 'unstable' into GT6-styled_pipes
Blood-Asp Nov 25, 2017
7cc77f5
Merge pull request #1264 from Antifluxfield/GT6-styled_pipes
Blood-Asp Nov 25, 2017
af7e1d8
Merge pull request #1272 from SuperCoder7979/Magic-Fix
Blood-Asp Nov 25, 2017
1e620c0
Merge pull request #1276 from SuperCoder7979/Gasoline
Blood-Asp Nov 25, 2017
a2c7e31
Merge pull request #1279 from JohannesGaessler/ResistorRecipeChange
Blood-Asp Nov 25, 2017
8721013
Merge branch 'unstable' into CrackingFollowup
Blood-Asp Nov 25, 2017
4cbc1b6
Merge branch 'unstable' into CrackingFollowup
Blood-Asp Nov 25, 2017
d77ee5f
Merge pull request #1283 from JohannesGaessler/CrackingFollowup
Blood-Asp Nov 25, 2017
eb7185c
Merge pull request #1284 from redmage17/unstable
Blood-Asp Nov 25, 2017
d6cbc47
Merge pull request #1297 from JohannesGaessler/MoreFlexibleOilCracker…
Blood-Asp Nov 25, 2017
7ce0ce8
Merge pull request #1298 from JohannesGaessler/MoreFlexibleLCRStructure
Blood-Asp Nov 25, 2017
84e95d3
Merge pull request #1300 from mitchej123/bloody_unstable
Blood-Asp Nov 25, 2017
e9627a5
Rebalance Tritanium cost, add new fusion recipes (Tungsten + Indium p…
Blood-Asp Nov 25, 2017
de94c67
Cheaper SoC
Blood-Asp Nov 25, 2017
4b65784
Alternative high tier Lapo Orb Cluster recipe to reduce nessary Lapoc…
Blood-Asp Nov 25, 2017
4ae74f6
Lossy Imp Compressor recipes for higher tier gems from lower tier gems.
Blood-Asp Nov 25, 2017
0305f86
Oredict fixes
Blood-Asp Nov 25, 2017
b96180a
GT6 style concrete speedup (no soulsand like behavior that blocks you…
Blood-Asp Nov 25, 2017
f9c8159
Default off config for GalacticraftOil compat
Blood-Asp Nov 25, 2017
1c8ef74
Update language files
YoungGT Nov 27, 2017
df081bd
Update zh_CN.lang
YoungGT Nov 27, 2017
34f8850
Fix a bug about achievements
YoungGT Nov 27, 2017
ac87a0c
Update en_US.lang
YoungGT Dec 21, 2017
e97f2e4
Update zh_CN.lang
YoungGT Dec 21, 2017
98f1563
Merge pull request #1306 from YoungGT/unstable
Blood-Asp Dec 21, 2017
a7f5b9b
Fix wrong translation (#1309)
Antifluxfield Dec 21, 2017
a40750b
Fixed RawRubber from Isoprene recipe (#1311)
Dec 21, 2017
f73c0fd
Fix pipe behaviors (#1329)
Antifluxfield Dec 21, 2017
d66cecb
Improve the mechanism of custom materials (#1341)
Antifluxfield Dec 21, 2017
7f08c17
Reserved some Meta Tile ID's.
draknyte1 Jan 29, 2018
e63b035
Bugfix: Small boiler ash types mixing (#1303)
SteelGiant87 Feb 10, 2018
65930a2
Electrolysis of Sulfur Dioxide/Carbon Dioxide (#1307)
Feb 10, 2018
92bcce8
Fixed Mufflers and Large Boiler Fuels. (#1319)
draknyte1 Feb 10, 2018
4481aec
Chemistry revision: Volume conservation and simpler recipes (#1334)
Feb 10, 2018
15aa49a
Rework gasoline (#1342)
jaskarth Feb 10, 2018
30eb5f0
Change diesel to combustion (#1343)
jaskarth Feb 10, 2018
7d36c60
[unstable branch] Converted to PNG as it should be. (#1345)
leagris Feb 10, 2018
a3f1b52
Localization (#1346)
Antifluxfield Feb 10, 2018
8a1f56d
Fix iridium neutron reflector behavior (#1348)
Antifluxfield Feb 10, 2018
5cb5bd0
GT6 cable quality of life improvements (#1349)
mitchej123 Feb 10, 2018
d1c2477
patch a render issue (#1353)
Antifluxfield Feb 10, 2018
38d150a
Fix that the main facing of basic machines can be set to top/bottom (…
Antifluxfield Feb 10, 2018
548f5ec
NEI support enhancement (#1361)
Antifluxfield Feb 10, 2018
4a4f7da
Oredict support for AssLine Recipe (#1363)
Antifluxfield Feb 10, 2018
2b21b51
Update drain/fill to take into account pipe connections (#1371)
mitchej123 Feb 10, 2018
d553daa
Fix custom enchantment for materials (#1374)
Antifluxfield Feb 10, 2018
c0d544e
Fix: GregTech Axe don't harvest blocks that have not harvest tool (ha…
shpakovivan Feb 10, 2018
5410ce6
Fix: Large Boiler ignore Programmed Circuit (#1384)
shpakovivan Feb 10, 2018
2cea339
Create de_DE.lang (#1385)
DerMilchkarton Feb 10, 2018
cc40637
Fix: Fluid pipes transfer capacity (#1378)
shpakovivan Feb 11, 2018
480e087
Magneticraft & FMP Dependency (#1304)
draknyte1 Feb 11, 2018
a205cbc
Should fix #1389 (#1392)
Antifluxfield Feb 12, 2018
632d9fc
Fix Fusion reactor possibly taking damage.
Blood-Asp Feb 12, 2018
4b2c122
Fix #1356
Blood-Asp Feb 12, 2018
7cc4d69
Update de_DE.lang (#1394)
DerMilchkarton Feb 14, 2018
bc2d51b
Create ru_RU.lang (#1395)
Sirse Feb 14, 2018
6eb95c1
Gasoline revision (#1398)
Feb 17, 2018
f119909
Cleanup Materials/ModSupport
mura3277 Feb 18, 2018
90cfe21
add IHL to ModSupport
mura3277 Feb 18, 2018
a6c31a3
Remove ore items for chrome and naquadria
mura3277 Feb 18, 2018
45342f9
Remove huge wrought iron pipe
mura3277 Feb 18, 2018
c8714e9
Forgot about combs
mura3277 Feb 24, 2018
c653af1
FEATURE - Added Extruder recipe for Small Gear (#1436)
Servek Apr 11, 2018
3936cf7
FIX - Updated Frequency Transmitter Recipe (#1435)
Servek Apr 11, 2018
ddd82e5
Up cast total EU to long (#1430)
Technus Apr 11, 2018
7e2d907
Fixed bug - drain cover don't work when installed on pipe. (#1428)
Dimach Apr 11, 2018
860cc0d
Fixed bug in filter behavior. (#1425)
Dimach Apr 11, 2018
fcdb80b
Adv seismic prospector reworked (#1419)
Wo0kiee Apr 11, 2018
b397aba
Fixed #1406 (#1413)
Dimach Apr 11, 2018
0c52368
Fixed bug - Axe harvest stone blocks from Underground Biomes Construc…
Servek Apr 11, 2018
be7c5d7
Oil Drilling Rig fixes (#1410)
Wo0kiee Apr 11, 2018
8ee2d52
Fixed Electrolysis of SO2/CO2 only working when using complicated che…
Apr 11, 2018
fd56cf4
Small lava boiler "calcification" mechanic (#1316)
SteelGiant87 Apr 11, 2018
0866610
Add techtech range
Technus May 7, 2018
90d5a9f
Merge pull request #1451 from Technus/patch-1
draknyte1 May 7, 2018
780410c
added range for bartimaeusnek
bartimaeusnek Jul 2, 2018
66379be
changed range to the "next one who asks me" range...
bartimaeusnek Jul 2, 2018
83f2995
Merge pull request #1474 from bartimaeusnek/patch-1
draknyte1 Jul 13, 2018
02b24ba
Fixed error in tungstensteel multipipes name. (#1446)
Dimach Oct 7, 2018
eef9513
Add config for Small Boiler Automation (#1449)
redmage17 Oct 7, 2018
c664a81
Fixed error in multiblock drillers. (#1452)
Dimach Oct 7, 2018
d3c43ea
% fix(texture): fusion control computer gui (#1462)
leagris Oct 7, 2018
b46a466
Fixed bug in macerator recipes. (#1468)
Dimach Oct 7, 2018
45bee96
fix(oilsand ore): centrifuge recipes (#1485)
leagris Oct 7, 2018
1568303
Fixed BorosilicateGlass recipe (#1486)
Spartak1997 Oct 7, 2018
2e59ff8
Assembler recipes for Pump Covers (#1487)
Spartak1997 Oct 7, 2018
6a1b45f
fix(blockmachines): persistency on harvest (#1498)
leagris Oct 7, 2018
3531fb2
Magical Energy Absorber fix stop drain and rework Vis to EU Conversio…
leagris Oct 7, 2018
d1e010d
Better NC panel input/output format and additional book recipe (#1501)
Dimach Dec 9, 2018
0beea90
Add volumetric flask. (#1500)
Dimach Dec 9, 2018
8a61e38
Fix maintenance cover (#1496)
UhoMazino Dec 9, 2018
cd841ad
Fix #1439 and #1456 (#1503)
YoungGT Dec 9, 2018
eaa93a0
Add disable sort option for input bus. Default behavior will stay same
Dimach Dec 12, 2018
88a7715
depricate Phosphor
Blood-Asp Dec 12, 2018
db7c85e
Fix flask crash on server
Dimach Dec 13, 2018
c1f4709
reserve IDs
Blood-Asp Jan 8, 2019
08a1e47
added my addon (bartworks) to the readme
bartimaeusnek Jan 11, 2019
a99309d
Mild Adjustment to Meta ID allocations.
draknyte1 Jan 30, 2019
9a1b42a
Merge pull request #1508 from bartimaeusnek/patch-2
draknyte1 Feb 8, 2019
3198060
Merge pull request #1513 from draknyte1/patch-1
draknyte1 Feb 8, 2019
cf57e09
Merge pull request #1506 from Dimach/flask_fix
draknyte1 Feb 8, 2019
73ee102
Pipe/cable overhaul; Fluidfilter fix, GC Energy Compat & Misc fixes …
mitchej123 Apr 27, 2019
b3c782a
Add usage for Tantalum in SMD Capacitor recipes (#1524)
Spartak1997 Apr 28, 2019
8d85f3a
Add usage for Tantalum №2 (#1525)
Spartak1997 Apr 28, 2019
aa159dc
Improved LuV+conveyor modules (#1527)
AndreySolodovnikov Apr 28, 2019
65adcbc
Added organic replicator (#1530)
AndreySolodovnikov Apr 28, 2019
f26e2c4
Added an Advanced Processing Array (#1528)
AndreySolodovnikov Apr 28, 2019
ae88bea
Formatting fix
Blood-Asp Apr 28, 2019
49137e7
More fixes
Blood-Asp Apr 28, 2019
25d4422
Port digital transformers by Spartak (#1511)
Dimach Jun 16, 2019
aa577dd
Added some fixes for old bugs (#1529)
AndreySolodovnikov Jun 16, 2019
3a6581c
Screen cover pr (#1532)
AndreySolodovnikov Jun 16, 2019
759fdf4
update image
Blood-Asp Jun 16, 2019
9a94c84
Added zincite Carbothermic Reduction recipe to electric blast furnac…
AndreySolodovnikov Jun 16, 2019
31fc5f9
added hard radon recipe and config for it (#1534)
AndreySolodovnikov Jun 16, 2019
18907fd
fixed OR bug (#1535)
AndreySolodovnikov Jun 16, 2019
7b592a6
fixed teleporter bug with dragon egg and nitrogen plasma (#1536)
Zickfor Jun 16, 2019
121b19f
Merge pull request #1 from Blood-Asp/unstable
AndreySolodovnikov Jun 19, 2019
4e7734a
Fixed difital transformer gui bug
AndreySolodovnikov Jun 19, 2019
7394cf9
Adjusted Adv Transormer buffer
AndreySolodovnikov Jun 19, 2019
81354d1
Changed description and optimized code.
Dimach Jun 20, 2019
4771071
Update GT_MetaTileEntity_BasicMachine_GT_Recipe.java
bartimaeusnek Sep 4, 2019
3536009
Update GT_MetaTileEntity_BasicMachine_GT_Recipe.java
bartimaeusnek Sep 4, 2019
17cdc82
Update GT_MetaTileEntity_BasicMachine_GT_Recipe.java
bartimaeusnek Sep 5, 2019
06fbecf
New ID reservation
shinkuri Oct 10, 2019
fcf519d
fix 1545 GT_MachineRecipeLoader run() method too big
leagris Nov 16, 2019
11ba5e8
Fixed Power injection for Multiblocks.
draknyte1 Dec 13, 2019
8d6e7b6
Added Scanner requirement to NEI for Assembly Line recipes.
draknyte1 Dec 13, 2019
be8b163
Fixed Build Script.
draknyte1 Dec 13, 2019
3a9e389
Added a better way for the Processing Array to handle recipes.
draknyte1 Dec 13, 2019
b96b301
Tidied PR up a little bit.
draknyte1 Dec 13, 2019
e4f8398
Fixed minor oversight in range check.
draknyte1 Dec 13, 2019
e5341f7
feature(i18n): itemlist withname locale
leagris Dec 25, 2019
cb147fb
Update ItemList.java
leagris Dec 26, 2019
f207774
Fixed overlap with GT++ Texture range
draknyte1 Apr 6, 2020
2bd3aa3
Merge pull request #1543 from kekzdealer/patch-1
draknyte1 Apr 6, 2020
a2e706f
Merge pull request #1537 from AndreySolodovnikov/AdvTransFix
draknyte1 Apr 6, 2020
2612d1c
Merge pull request #1504 from Dimach/hatchMode
draknyte1 Apr 6, 2020
34ab089
Merge pull request #1541 from bartimaeusnek/patch-2
draknyte1 Apr 6, 2020
64575bc
Merge pull request #1549 from draknyte1/Fix-Scanner-NEI
draknyte1 Apr 6, 2020
f69f11f
Merge pull request #1558 from Blood-Asp/draknyte1-patch-texturerange
draknyte1 Apr 6, 2020
2ee9d15
Merge pull request #1550 from draknyte1/Fix-Build-Process
draknyte1 Apr 6, 2020
2f813f7
Merge pull request #1552 from leagris/patch-3
draknyte1 Apr 6, 2020
9a533aa
Avoid caching the same recipe map more than once.
draknyte1 Apr 6, 2020
e9ac987
Merge pull request #1551 from draknyte1/Fix-Shitty-PA-Handling
draknyte1 Apr 6, 2020
628cff9
Merge pull request #1548 from draknyte1/Fix-Multi-Power-Injection
draknyte1 Apr 6, 2020
cf9e662
Added Gradle Wrapper to workspace.
draknyte1 Apr 7, 2020
9ccbc36
Merge pull request #1559 from draknyte1/Minor-Fixes
draknyte1 Apr 7, 2020
c374469
Added a missing bracket & missing imports. I assume @bartimaeusnek di…
draknyte1 Apr 7, 2020
540a838
Merge pull request #1560 from draknyte1/Fix-Barts-PR
draknyte1 Apr 7, 2020
2f5bf6e
Merge pull request #1546 from leagris/fix-1545
draknyte1 May 24, 2020
016ea46
Made Volumetric Flasks more flexible.
draknyte1 May 26, 2020
f83d381
Merge pull request #1565 from Blood-Asp/FlaskFix
draknyte1 May 26, 2020
45373ba
Fixed missing annotation, prevents crashing Server Side if class is a…
draknyte1 May 27, 2020
77a3c95
Merge pull request #1566 from Blood-Asp/FlaskFix
draknyte1 May 27, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 50 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
# Contributing

When contributing to this repository, please first discuss the change you wish to make via our public Discord channel if possible.
Be sure to consult the correct channel and dev, use #gregtech5 for GT5u and gregtech5-12 for GT 5.10/5.12 development.

Please note we have a level of quality to maintain, please follow the guidelines in all your interactions within the project.

## Issue Creation Process

1. Try and see if the issue already has a pre-existing issue open.
2. Provide the version of GT you are using and the version of IC2. Providing a full modlist helps.
3. Try to explain the issue in details and include any aditional info if possible. Screenshots, Video or a way to reproduce the issue.
* Failing to provide all of the above details can result in an issue being closed without action.

## Pull Request Process

1. Ensure any new build dependencies are noted within the PR details and why it's a valid requirement.
2. Try ensure that the build works successfully and attempt to test it yourself thoroughly.
3. Please open a new PR for each issue you wish to resolve instead of fixing ten bugs in one go. This makes review easier, thank you.
4. You will have the Pull Request merged in once you have the sign-off of tone other developer & @Blood-Asp, also whenever @Blood-Asp finds time.

## Standard of Quality

### Our Goal

In the interest of fostering an open project environment, we as
contributors and maintainers try to make participation in our project and
our community a hassle-free experience wherever possible..

### Our Standards

Practices that contribute to creating a positive environment
include:

* Follow the codestyle used through most of the project
* Being respectful of differing viewpoints on the PR
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Try to document your code as you go for future readability.

Practies we'd like to avoid include:

* Leaving large code comment segments commented out without any comments.
* Making large changes to pre-existing content without large community consultation beforehand. (Provided that the code changed won't continue to be backcompatible for addons.)

### Our Responsibilities

Project maintainers have the right and responsibility to remove, edit, or
reject comments, commits, code, issues, and other contributions
that are not aligned to this Code of Conduct.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,11 @@ Please do! However, please take a note of current issues and what is currently b
[Tinkers Gregworks](https://github.com/Vexatos/TinkersGregworks) Tinkers Construct Tools made with GT materials.<br />
[GalacticGreg](https://forum.industrial-craft.net/thread/11039-gregtech-addon-addon-galacticgreg-1-9-gregtech-oregen-on-galacticraft-planets/) GregTech Worldgen on Galacticraft Planets (Directly integrated into GT5.09.23+)<br />
[TecTech](https://github.com/Technus/TecTech)<br />
[bartworks](https://github.com/bartimaeusnek/bartworks) A partial GT2 port and additional Machinery<br />

## Modpacks

[Beyond Reality](https://www.atlauncher.com/pack/BeyondReality)<br />
[Infitech 2](https://forum.feed-the-beast.com/threads/1-7-10-listed-infitech-2-modpack-v3-2-21-hqm-gregtech-balanced-hard-mode-modpack.50185/)<br />
[GT New Horizons](https://www.technicpack.net/modpack/mcnewhorizons.677387)<br />
[Идеальная Индустриальная Сборка / Ideal Industrial Assembly](http://sapientmail.wixsite.com/minecraft)<br />
[Идеальная Индустриальная Сборка / Ideal Industrial Assembly](http://sapientmail.wixsite.com/minecraft)<br />
147 changes: 74 additions & 73 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
buildscript {
repositories {
mavenCentral()
maven {
name = "forge"
url = "http://files.minecraftforge.net/maven"
}
jcenter()
//maven {
// name = "forge"
// url = "http://files.minecraftforge.net/maven"
//}
maven {
name = "gt"
url = "https://gregtech.overminddl1.com/"
}
maven {
name = "sonatype"
url = "https://oss.sonatype.org/content/repositories/snapshots/"
Expand All @@ -15,8 +20,30 @@ buildscript {
}
}

apply plugin: 'forge'
// Because Forge is too stupid to fix Deprecation Issues, and we cannot fix it on our end! (until we fork Forge)
allprojects {
tasks.withType(JavaCompile) {
options.compilerArgs << "-Xlint:deprecation"
}
}

apply plugin: 'eclipse'
eclipse {
classpath {
downloadJavadoc = true
downloadSources = true
}
}

apply plugin: 'idea'
idea{
module {
downloadJavadoc = true
downloadSources = true
}
}

apply plugin: 'forge'

file "build.properties" withReader {
def prop = new Properties()
Expand All @@ -28,9 +55,12 @@ version = "${config.gt.version}"
group= "gregtech"
archivesBaseName = "gregtech"


sourceCompatibility = 1.7
targetCompatibility = 1.7
compileJava.options.bootClasspath = org.gradle.internal.jvm.Jvm.current().getJre().getHomeDir().toString() +"/lib/rt.jar"
compileJava {
options.encoding = "UTF-8"
}

minecraft {
version = "${config.minecraft.version}-${config.forge.version}"
Expand All @@ -46,76 +76,47 @@ configurations {
}

repositories {
maven {
name 'Forge'
url 'http://files.minecraftforge.net/maven'
}
maven {
name = "chickenbones"
url = "http://chickenbones.net/maven/"
}
maven {
name = "ic2, forestry"
url = "http://maven.ic2.player.to/"
}
maven { // EnderIO & EnderCore
name 'tterrag Repo'
url "http://maven.tterrag.com"
}
maven { // AppleCore
url "http://www.ryanliptak.com/maven/"
}
ivy {
name "BuildCraft"
artifactPattern "http://www.mod-buildcraft.com/releases/BuildCraft/[revision]/[module]-[revision]-[classifier].[ext]"
}
ivy {
name 'CoFHLib'
artifactPattern "http://addons-origin.cursecdn.com/files/${config.cofhlib.cf}/[module]-[revision].[ext]"
}
ivy {
name 'CoFHCore'
artifactPattern "http://addons-origin.cursecdn.com/files/${config.cofhcore.cf}/[module]-[revision].[ext]"
}
ivy {
name 'Railcraft'
artifactPattern "http://addons-origin.cursecdn.com/files/${config.railcraft.cf}/[module]_[revision].[ext]"
}
ivy {
name 'IC2NuclearControl'
artifactPattern "http://addons-origin.cursecdn.com/files/${config.nc.cf}/[module]-[revision].[ext]"
}
ivy {
name 'ImmersiveEngineering'
artifactPattern "http://addons-origin.cursecdn.com/files/${config.immeng.cf}/[module]-[revision].[ext]"
}
ivy {
name 'magneticraft'
artifactPattern "http://addons-origin.cursecdn.com/files/${config.magneticraft.cf}/[module]-[revision].[ext]"
}
maven {
name = "gt"
url = "http://gregtech.overminddl1.com/"
}
maven {
name = "ic2"
url = "http://maven.ic2.player.to/"
}
}

dependencies {
provided ("appeng:appliedenergistics2:${config.ae2.version}:dev") {
exclude module: '*'
}
provided "codechicken:CodeChickenLib:${config.minecraft.version}-${config.codechickenlib.version}:dev"
provided "codechicken:CodeChickenCore:${config.minecraft.version}-${config.codechickencore.version}:dev"
provided "codechicken:NotEnoughItems:${config.minecraft.version}-${config.nei.version}:dev"
provided "net.industrial-craft:industrialcraft-2:${config.ic2.version}:dev"
provided "net.sengir.forestry:forestry_${config.minecraft.version}:${config.forestry.version}:dev"
provided "applecore:AppleCore:${config.applecore.version}:api"
provided "com.enderio.core:EnderCore:${config.enderiocore.version}:dev"
provided ("com.enderio:EnderIO:${config.enderio.version}:dev") {
transitive = false
}
provided name: 'buildcraft', version: config.buildcraft.version, classifier: "dev", ext: 'jar'
provided name: 'CoFHLib', version: config.cofhlib.version, ext: 'jar'
provided name: 'CoFHCore', version: config.cofhcore.version, ext: 'jar'
provided name: 'Railcraft', version: config.railcraft.version, ext: 'jar'
provided name: 'IC2NuclearControl', version: config.nc.version, ext: 'jar'
provided name: 'ImmersiveEngineering', version: config.immeng.version, ext: 'jar'
provided name: 'magneticraft', version: config.magneticraft.version, ext: 'jar'
// compile fileTree(dir: 'libs', include: '*.jar')

// Mostly Used for compileOnly, if you prefer normal IC2, uncomment it instead.
//provided "net.industrial-craft:industrialcraft-2:${config.ic2.version}:dev"
compile "ic2:IC2Classic:1.2.1.8:dev"

compile "mcp.mobius.waila:Waila:1.5.11-RC2-NONEI_1.7.10:dev"
compile "codechicken:CodeChickenLib:1.7.10-1.1.3.140:dev"
compile "codechicken:CodeChickenCore:1.7.10-1.0.7.47:dev"
compile "codechicken:NotEnoughItems:1.7.10-1.0.5.120:dev"

compileOnly "com.enderio.core:EnderCore:1.7.10-0.2.0.39_beta:dev"
// "com.enderio:EnderIO:1.7.10-2.3.0.429_beta:dev"
compileOnly "com.enderio:EnderIO:1.7.10-2.3.0.430_beta:dev"

compileOnly "cofh:CoFHCore:1.7.10R3.0.4:dev"
compileOnly "cofh:CoFHLib:1.7.10R3.0.3:dev"
compileOnly "com.mod-buildcraft:buildcraft:7.1.23:dev"
compileOnly "net.sengir.forestry:forestry_1.7.10:4.2.16.64:dev"
compileOnly "mods.railcraft:Railcraft_1.7.10:9.12.3.0:dev"

compileOnly "micdoodle8.mods:GalacticraftCore:1.7-3.0.12.504:Dev"
compileOnly "micdoodle8.mods:MicdoodleCore:1.7-3.0.12.504:Dev"

compileOnly "thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev"
compileOnly "com.azanor.baubles:Baubles:1.7.10-1.0.1.10:deobf"
compileOnly "appeng:appliedenergistics2:rv3-beta-6:dev"
compileOnly "applecore:AppleCore:1.7.10-3.1.1:deobf"
compileOnly "com.shedar.IC2NuclearControl:IC2NuclearControl:2.4.3a:dev"

}

processResources
Expand Down
27 changes: 2 additions & 25 deletions build.properties
Original file line number Diff line number Diff line change
@@ -1,27 +1,4 @@
minecraft.version=1.7.10
forge.version=10.13.4.1566-1.7.10

gt.version=5.09.31
ae2.version=rv2-beta-33
applecore.version=1.7.10-1.2.1+107.59407
buildcraft.version=7.1.11
codechickenlib.version=1.1.3.140
codechickencore.version=1.0.7.47
cofhcore.cf=2246/920
cofhcore.version=[1.7.10]3.0.3-303-dev
cofhlib.cf=2246/918
cofhlib.version=[1.7.10]1.0.3-175-dev
enderio.cf=2219/296
enderio.version=1.7.10-2.3.0.417_beta
enderiocore.version=1.7.10-0.1.0.25_beta
forestry.version=4.2.10.58
forge.version=10.13.4.1614-1.7.10
ic2.version=2.2.790-experimental
nei.version=1.0.3.57
railcraft.cf=2219/321
railcraft.version=1.7.10-9.4.0.0
nc.cf=2275/987
nc.version=2.3.4a
immeng.cf=2299/20
immeng.version=0.7.7-deobf
magneticraft.cf=2276/268
magneticraft.version=0.6.1-final
gt.version=5.09.31
Binary file added gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
6 changes: 6 additions & 0 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#Wed Jul 02 15:54:47 CDT 2014
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.2.1-all.zip
Loading