Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1068 commits
Select commit Hold shift + click to select a range
152dc9e
Compatibility - update API for MFR beta 1.12. Fix #3441.
radfast Jun 25, 2018
e1013ff
Merge branch 'master' into MC1.10
radfast Jun 25, 2018
183be9c
Merge branch 'MC1.10' into MC1.11
radfast Jun 25, 2018
99a96f4
Merge upstream changes.
radfast Jun 25, 2018
75156ef
Compatibility - Matter Overdrive android compatibility restored in 1.12.
radfast Jun 25, 2018
5e9590b
Update ko_KR.lang
mindy15963 Jul 20, 2018
d5489ee
Update ko_KR.lang
mindy15963 Jul 20, 2018
ce669c4
Update ko_KR.lang
mindy15963 Jul 21, 2018
10336eb
Update ko_KR.lang
mindy15963 Jul 21, 2018
1332b5d
Update ko_KR.lang
mindy15963 Jul 21, 2018
2806e4c
Update ko_KR.lang
mindy15963 Jul 21, 2018
8479ea7
Update ko_KR.lang
mindy15963 Jul 21, 2018
7635beb
Update ko_KR.lang
mindy15963 Jul 21, 2018
2d0f782
Update ru_RU.lang
Aug 26, 2018
7d554a6
Merge pull request #3479 from mindy15963/master
micdoodle8 Sep 4, 2018
3586b5d
Merge pull request #3515 from AlekseiVoronin/patch-1
micdoodle8 Sep 4, 2018
5111788
Update New Issue template
radfast Dec 1, 2018
ddc51f0
Fix rare client crash when two add-ons conflict. Close #3534.
radfast Dec 2, 2018
ac576ec
Fix rare crash relating to Sensor Glasses and leak tracing. Fix #3560.
radfast Dec 2, 2018
dbb08ff
Fix crash with Volcanic Pickaxe on unique blocks in 1.10+. Fix #3535.
radfast Dec 2, 2018
de1f45d
Fix some issues with Display Screen connections. Fix #3520.
radfast Dec 2, 2018
e02ebdf
Fix night vision potion item (#3425)
SteveKunG Dec 2, 2018
8a08b9d
API - add new IArmorCorrosionResistant - thanks to @BlesseNtumble. Se…
radfast Dec 2, 2018
d64d6d5
New feature: Achievements for 1.8 through 1.11 (#3526)
marcus8448 Dec 2, 2018
855aa6a
Restore degrees symbol in en_US language file after last commit.
radfast Dec 2, 2018
a6a7d71
New feature: Advancements [1.12 version of Achievements] (#3527)
marcus8448 Dec 2, 2018
f68fa4d
Adjust player y-position after Short Range Teleport. Fix #3509.
radfast Dec 2, 2018
dd36e46
Merge upstream changes.
radfast Dec 2, 2018
fec03fc
Merge upstream changes.
radfast Dec 2, 2018
c57d3c4
Advancements in 1.12 - changed lang labels to same as 1.11.
radfast Dec 2, 2018
6e25719
Merge upstream changes.
radfast Dec 2, 2018
4cad7f5
Fix degrees symbol in 1.12 lang file (changed in prev commit)
radfast Dec 2, 2018
260fa7b
Prevent rare crashes when map corrupted for non-GC reasons.
radfast Dec 2, 2018
b7b46af
Update Russian translation
QuantumStatement Dec 10, 2018
1ea1fe0
Update Russian translation
QuantumStatement Dec 10, 2018
952976f
Update MinecraftForge Maven URL
micdoodle8 Dec 16, 2018
1d5f869
Allow for Tier 1 - 3 rocket, Cargo Rocket, Moon buggy, Astro Miner r…
MJRLegends Dec 28, 2018
ed9f6a7
Changed GC Planets registering recipes to match GC Core system
MJRLegends Dec 28, 2018
f64693c
Added OreDictionary value for Cheese Curd
coolsimulations Dec 29, 2018
378ebbe
Updated Cheese Block Recipe to use OreDictionaty value
coolsimulations Dec 29, 2018
df9f775
Merge pull request #3579 from coolsimulations/patch-1
micdoodle8 Dec 30, 2018
b534287
Merge pull request #3580 from coolsimulations/patch-2
micdoodle8 Dec 30, 2018
3ea4490
Merge pull request #3564 from QuantumStatement/ru-achievments
micdoodle8 Dec 30, 2018
2470153
Merge pull request #3565 from QuantumStatement/ru-advancements
micdoodle8 Dec 30, 2018
06d8c1f
Fix null & sensor glasses check. Credit to @BlesseNtumble
micdoodle8 Dec 30, 2018
b060da6
Merge pull request #3577 from MJRLegends/patch1.8-1
micdoodle8 Dec 30, 2018
195effb
Fix no tooltips on energy storage module. Fixes #3538.
micdoodle8 Dec 30, 2018
cb16e49
Merge branch 'master' of https://github.com/micdoodle8/Galacticraft
micdoodle8 Dec 30, 2018
b9dda08
Fix missing tooltips in 1.12.2
micdoodle8 Dec 30, 2018
c1da8fc
Merge branch 'MC1.12' of https://github.com/micdoodle8/Galacticraft i…
micdoodle8 Dec 30, 2018
2dfdace
Merge pull request #3578 from MJRLegends/patch1.12-1
micdoodle8 Dec 30, 2018
32568c1
Dimension type name shouldn't change when language is changed. Fixes …
micdoodle8 Dec 30, 2018
abaedbd
Fix cubic chunks compatibility. Fixes #3549.
micdoodle8 Dec 30, 2018
13c97a8
For Achievements
ETStareak Dec 31, 2018
f852c74
Update zh_CN.lang
ETStareak Dec 31, 2018
03de867
Merge pull request #3589 from ETStareak/master
micdoodle8 Jan 5, 2019
11e0b09
Merge upstream changes
micdoodle8 Jan 6, 2019
7cbc5d0
Merge upstream changes
micdoodle8 Jan 6, 2019
4a73eb2
Merge upstream changes
micdoodle8 Jan 6, 2019
1749829
Fix recipe registration location. Credit to @MJRLegends.
micdoodle8 Jan 7, 2019
fa022a5
Fix bubble distributor not working after death. Fixes #1718. Fixes #3…
micdoodle8 Jan 8, 2019
9988a4e
Fix display screen connections. Fixes #3599.
micdoodle8 Jan 8, 2019
f621f06
Fix crash in dev environment
micdoodle8 Jan 8, 2019
f5707c7
Fix moon rock appearing as copper ore in inventory.
micdoodle8 Jan 9, 2019
8fa3d4a
Merge upstream changes
micdoodle8 Jan 9, 2019
08db244
Merge upstream changes
micdoodle8 Jan 9, 2019
8adc75b
Fix errors after merge
micdoodle8 Jan 9, 2019
679ba24
Merge upstream changes
micdoodle8 Jan 9, 2019
f3e7127
Fix crash when breaking some blocks with volcanic pickaxe. Fixes #3566.
micdoodle8 Jan 9, 2019
3643490
Fix OxygenUtil itemstack checks. Fixes #3601.
micdoodle8 Jan 9, 2019
2cb988d
Add helper method for MicdoodleCore
micdoodle8 Jan 9, 2019
1d1d641
Update version number
micdoodle8 Jan 9, 2019
d5be2ae
Merge upstream changes
micdoodle8 Jan 9, 2019
e4e8fde
Merge branch 'MC1.10' into MC1.11
micdoodle8 Jan 9, 2019
00382d6
Merge branch 'MC1.11' into MC1.12
micdoodle8 Jan 9, 2019
c3be1f3
New feature: Solar Arrays. Credit to @EzerArch for idea & textures.
micdoodle8 Jan 12, 2019
99bbded
Merge upstream changes
micdoodle8 Jan 12, 2019
153272b
Merge upstream changes
micdoodle8 Jan 12, 2019
b4e7046
Merge upstream changes
micdoodle8 Jan 12, 2019
b1ee4ca
Solar Array tweaks
micdoodle8 Jan 12, 2019
137d825
Merge upstream changes
micdoodle8 Jan 12, 2019
3faf5ef
Merge upstream changes
micdoodle8 Jan 12, 2019
bac440e
Merge upstream changes
micdoodle8 Jan 12, 2019
9586566
Update ru_RU.lang
Romsik788 Jan 12, 2019
b39f44b
Fix crash when placing solar array controller. Fixes #3607.
micdoodle8 Jan 12, 2019
93784db
Merge branch 'master' into MC1.10
micdoodle8 Jan 12, 2019
3286bc6
Merge branch 'MC1.10' into MC1.11
micdoodle8 Jan 12, 2019
b026177
Merge branch 'MC1.11' into MC1.12
micdoodle8 Jan 12, 2019
14d3b20
Merge pull request #3609 from Romsik788/patch-1
micdoodle8 Jan 12, 2019
477a676
Fix solar module network splitting issue. Fixes #3611.
micdoodle8 Jan 13, 2019
4bbe007
Merge branch 'master' of https://github.com/micdoodle8/Galacticraft
micdoodle8 Jan 13, 2019
f5dadc1
Update "versionRev" to 2
marcus8448 Jan 14, 2019
71ed048
Fix NASA Workbench recipes accepting null itemstacks.
micdoodle8 Jan 15, 2019
2343542
Merge pull request #3612 from marcus8448/master
micdoodle8 Jan 15, 2019
6f1bb81
Merge branch 'master' into MC1.10
micdoodle8 Jan 16, 2019
151feda
Fix error in previous commit
micdoodle8 Jan 16, 2019
672739a
Merge branch 'MC1.10' into MC1.11
micdoodle8 Jan 16, 2019
0526541
Merge branch 'MC1.11' into MC1.12
micdoodle8 Jan 16, 2019
585ad61
Use maven repos instead of dependencies/ folder
marcus8448 Feb 4, 2019
3f8a5fc
Remove unnecessary tab/space formatting
marcus8448 Feb 4, 2019
9a9af19
Stop creating source jars
marcus8448 Feb 4, 2019
3eda832
Fix solar arrays crash. Fixes #3641.
micdoodle8 Mar 12, 2019
7f739e0
Merge upstream changes
micdoodle8 Mar 14, 2019
a54df64
Merge branch 'MC1.10' into MC1.11
micdoodle8 Mar 14, 2019
4280a96
Merge branch 'MC1.11' into MC1.12
micdoodle8 Mar 14, 2019
7926c34
Merge pull request #3630 from marcus8448/MC1.12
micdoodle8 Mar 17, 2019
33af6a3
Fix build script errors
micdoodle8 Mar 27, 2019
1af0a27
Update capes.txt
micdoodle8 Mar 28, 2019
ed84afa
Fix crash if distributor is remove near world bounds. Fixes #3658.
micdoodle8 Mar 28, 2019
1144f7e
Fix alpha test not being re-enabled after sensor glasses pass. Fixes …
micdoodle8 Mar 28, 2019
06d4345
Improve dungeon entrance crater gen. Fixes #3613.
micdoodle8 Mar 28, 2019
b475eee
Tweak dungeon length
micdoodle8 Mar 30, 2019
86e42d7
UUID Capes
marcus8448 Apr 25, 2019
3588dd6
Remove debug logging
marcus8448 Apr 25, 2019
427ce61
Update cs_CZ.lang
martinm236 Apr 25, 2019
7a17301
Update fr_FR.lang
Dawn7293 May 8, 2019
f1313d2
Merge pull request #3686 from MosquitoFRA/patch-1
micdoodle8 Jun 10, 2019
810346f
Merge pull request #3677 from martinm236/patch-6
micdoodle8 Jun 10, 2019
333cc4c
Merge pull request #3676 from marcus8448/uuid-capes
micdoodle8 Jun 10, 2019
286e89f
Fix railcraft crash with invalid item. Fixes #3671
micdoodle8 Jun 10, 2019
5eae85b
Merge branch 'master' of https://github.com/micdoodle8/Galacticraft
micdoodle8 Jun 10, 2019
be1701d
Sapphire Ore can be smelted into Sapphires. Fixes #3668.
micdoodle8 Jun 10, 2019
f5bb40b
Fix NPE related to energy transmitters. Fixes #3700.
micdoodle8 Jun 10, 2019
6616e7f
Fix crash if AE2 dusts are disabled. Fixes #3680.
micdoodle8 Jun 12, 2019
1c04a3d
Update zh_CN.lang
ETStareak Jun 25, 2019
e22c070
Update zh_CN.lang
ETStareak Jun 25, 2019
0306e23
Readability refactoring: Gave meaningful names to var2 - var15
hypehuman Jul 2, 2019
595950b
Better Readme
marcus8448 Jul 4, 2019
51034b0
Fix 'contributing'
marcus8448 Jul 4, 2019
abd33fe
Update ClientProxyCore.java
marcus8448 Jul 10, 2019
e477dfd
Fixed small bug with DataParameter in EntityMeteor
SteveKunG Jul 17, 2019
a4fe67c
Item Handlers
micdoodle8 Jul 18, 2019
7b02e8b
Merge pull request #3708 from ETStareak/master
micdoodle8 Jul 18, 2019
ab73fe1
Merge pull request #3714 from hypehuman/hypehuman-rename
micdoodle8 Jul 18, 2019
ea85f7c
Merge pull request #3717 from marcus8448/BetterReadme
micdoodle8 Jul 18, 2019
a293221
Merge pull request #3721 from marcus8448/Debug-Log-Cape-Cleanup
micdoodle8 Jul 18, 2019
b181dc3
Allow addons to change oxygen collector sensitivity. Fixes #3724.
micdoodle8 Jul 18, 2019
f35b5e1
Merge pull request #3725 from SteveKunG/patch-1
micdoodle8 Jul 18, 2019
a54dd66
Remove final modifier from recent change
micdoodle8 Jul 18, 2019
fdedd28
Merge branch 'master' of https://github.com/micdoodle8/Galacticraft
micdoodle8 Jul 18, 2019
61252fd
Disable large overworld map due to performance concerns (until implem…
micdoodle8 Jul 20, 2019
38757b1
Add missing changes from ItemHandlers commit. Fixes #3727
micdoodle8 Jul 20, 2019
98cad7c
Fix floating lava on Venus. Fixes #3687.
micdoodle8 Jul 21, 2019
403f8bc
Fix more inventory related errors. Fixes #3730.
micdoodle8 Jul 21, 2019
c44f8f1
Fix energy storage module error.
micdoodle8 Jul 21, 2019
579479a
Don't save small asteroids. Fixes #3722.
micdoodle8 Jul 21, 2019
56142da
Fix telepad range. Fixes #3734.
micdoodle8 Jul 23, 2019
71d57e7
Fixed Electric Arc Furnace crash, fixes issue #3736
MJRLegends Jul 24, 2019
89603bf
Merge pull request #3737 from MJRLegends/master
micdoodle8 Jul 24, 2019
c912e0e
Update ko_KR.lang
mindy15963 Jul 25, 2019
e49c59d
Update ko_KR.lang
mindy15963 Jul 25, 2019
8123bd5
Update ko_KR.lang
mindy15963 Jul 25, 2019
2d98a62
Merge pull request #3738 from mindy15963/master
micdoodle8 Jul 26, 2019
d6399e3
Fixed telepad range inventory.
BlesseNtumble Jul 26, 2019
47ff613
Fix pick block parameter being ignored. Fixes #3741.
micdoodle8 Jul 26, 2019
d419e20
Fix capes. Fixes #3739.
micdoodle8 Jul 26, 2019
3ba8064
Merge pull request #3740 from BlesseNtumble/patch-9
micdoodle8 Jul 26, 2019
2d48bc4
Fix typo in last PR
micdoodle8 Jul 27, 2019
a8c7f56
Fix platform item model. Fixes #3703.
micdoodle8 Jul 27, 2019
d25722c
Attempt to fix a network crash. Fixes #3715. Fixes #3710.
micdoodle8 Jul 27, 2019
386e75a
Fix arc furnace, actually this time. Fixes #3745.
micdoodle8 Jul 28, 2019
39c9514
Fixed Creeper Boss ignore /kill command
SteveKunG Jul 28, 2019
748afa9
Merge pull request #3746 from SteveKunG/patch-1
micdoodle8 Jul 28, 2019
bc99a5c
Better map sensitivity. Thanks @SteveKunG.
micdoodle8 Jul 28, 2019
11c3385
Fix solar array crash. Fixes #3747.
micdoodle8 Jul 28, 2019
004dab2
Merge branch 'master' of https://github.com/micdoodle8/Galacticraft
micdoodle8 Jul 28, 2019
84ef5ac
Simplify celestial map a little bit. Fixes #3758.
micdoodle8 Aug 9, 2019
03d7e6c
Fix broken NASA workbench recipes. Fixes #3763.
micdoodle8 Aug 12, 2019
fe94b85
Fix telepad NBT crash
micdoodle8 Aug 12, 2019
a7cfed1
Fix meteors not spawning after hitting vertical walls. Fixes #3713.
micdoodle8 Aug 12, 2019
119b2bd
Add an option to disable small asteroids entirely
marcus8448 Aug 24, 2019
38c46e2
Make the buggy hitbox smaller
marcus8448 Aug 24, 2019
15da72c
Remove blank comments
marcus8448 Aug 24, 2019
b066c99
New Feature: Laser Turrets
micdoodle8 Aug 25, 2019
1d8cdfc
Fix log spam when rendering hand waving. Fixes #3770.
micdoodle8 Aug 25, 2019
f13c6ed
Laser Lighting Improvement, Using GlStateManager
SteveKunG Aug 25, 2019
4ff8165
Merge pull request #3774 from SteveKunG/patch-1
micdoodle8 Aug 25, 2019
ed5ea2e
Merge pull request #3772 from marcus8448/buggy-hitbox
micdoodle8 Aug 25, 2019
f672c33
Merge pull request #3771 from marcus8448/disable-asteroid-config
micdoodle8 Aug 25, 2019
2a2f6a5
Update zh_CN.lang
ETStareak Aug 25, 2019
d8ecccc
Refactor to reduce longest sourcefile path lengths
radfast Aug 25, 2019
6e92255
Fix space stations with gravity not loading. Fixes #3766.
micdoodle8 Aug 26, 2019
d6c9e90
Update zh_CN.lang
ETStareak Aug 26, 2019
0655b0e
Attempt to fix long-standing bug when running in Sponge. Fix #3775
radfast Aug 26, 2019
ce36c4e
Attempt to fix rare concurrency issues client-side. Fix #3767.
radfast Aug 26, 2019
f562644
Better logging of Biome ID conflicts. Fix #3753
radfast Aug 26, 2019
a5268e7
Fix rare ticking world entities crash with Arc Lamp. Fix #3704
radfast Aug 26, 2019
fbb5c29
Merge pull request #3776 from ETStareak/master
micdoodle8 Aug 27, 2019
2c84cf6
Include .class files in API jar
micdoodle8 Aug 27, 2019
f6a6d2b
Fix potential duping with Magnetic Crafting and certain other mods.
radfast Aug 28, 2019
c4c82e3
Fix Switchable Wire connectivity after network changes. Fix #3693.
radfast Aug 28, 2019
74d8104
Electric Compressor - improve automation of complex recipes. Fix #3619.
radfast Aug 28, 2019
44d90f2
Infinite Battery and other higher tier batteries speed up machines.
radfast Aug 28, 2019
0a1a715
Fix rare rain-sound related crashes on Venus. Fix #3777.
radfast Aug 29, 2019
2a1f2b7
Vacuum Glass - reset colors on world change. Fix #3709.
radfast Aug 29, 2019
e45bc29
Astrominers - correctly stay loaded even far from player. Fix #3643.
radfast Aug 30, 2019
30eb6de
Astrominers - keep working even on Sponge servers. Fix #3307.
radfast Aug 31, 2019
438d2b3
Update IItemThermal.java
BlesseNtumble Aug 31, 2019
5e15406
Update GCPlayerHandler.java
BlesseNtumble Aug 31, 2019
bb13184
Update ItemThermalPadding.java
BlesseNtumble Aug 31, 2019
33278cf
Update ItemThermalPaddingTier2.java
BlesseNtumble Aug 31, 2019
dc15ee2
Fix client-side laser charging. Fixes #3779.
micdoodle8 Aug 31, 2019
13be525
Fix new Biome ID conflict reporting on dedicated server.
radfast Sep 1, 2019
b131acc
Fix rare moon block crash caused by bugged other mod. Fix #3787.
radfast Sep 10, 2019
aa2dd40
Compatibility - update for post-August 2019 Sponge versions. Fix #3788
radfast Sep 10, 2019
ba67bb6
Compatibility - no more EnderIO Liquid Conduit warnings with Oxygen c…
radfast Sep 14, 2019
a7244cd
Compatibility - add compatibility with mchorse Metamorph mod. Fix #3791.
radfast Sep 16, 2019
3a2818e
Update ISSUE_TEMPLATE
radfast Sep 22, 2019
0d3fadf
Fix bug checking sealed spaces near y=0 or 255. See #3802.
radfast Oct 1, 2019
5d6faa2
Fix dedicated server crash with Laser Turret placement. Fix #3795.
radfast Oct 17, 2019
a80679f
Compatibility: improve IC2 Classic energy compatibility. Close #3800.
radfast Oct 17, 2019
7105e3b
Oxygen Sealer - slight performance improvement and attempt to resolve…
radfast Oct 17, 2019
7f71833
Compatibility - add Forge Energy output to GC power producers, improv…
radfast Oct 17, 2019
a299777
Add Galacticraft advancements - credit to marcu8448
marcus8448 Oct 17, 2019
d2fe150
Advancements - criteria registration was not visible in older Forge b…
radfast Oct 18, 2019
7a7264d
Attempt to resolve rare race condition when loading side-configurable…
radfast Oct 18, 2019
1c6510a
Bugfix - Cargo Loaders and Unloaders now sensitive to item NBT data. …
radfast Oct 18, 2019
7e14a03
Update zh_CN.lang
ETStareak Oct 18, 2019
fffb271
Update zh_CN.lang
ETStareak Oct 18, 2019
06bb468
Update en_US.lang
ETStareak Oct 18, 2019
8fb14dc
Update en_US.lang
ETStareak Oct 19, 2019
c3e272d
Update en_US.lang
ETStareak Oct 22, 2019
afd5a5a
Update en_US.lang
ETStareak Oct 23, 2019
66e1cb1
Update ja_JP.lang (#3824)
shino-shino16g Nov 14, 2019
b88eca9
Fix Energy Cluster issues when connected output-to-output. Close #3830.
radfast Nov 25, 2019
29e9cdf
Compatibility - fix EnderIO crash when registering Advancements. Fix …
radfast Nov 25, 2019
b9e2f95
Fix rare Deconstructor overflow issue with circular recipe chains. Fi…
radfast Nov 25, 2019
a3b52c2
Deconstructor now also salvages Diamonds.
radfast Nov 25, 2019
fd574d1
General Advancement Fixes/Improvements. Fix #3828. Fix #3837. Fix #3844
marcus8448 Jan 2, 2020
b99f3ff
fixed fuel input texture (#3838)
Ezoteric Jan 2, 2020
434503e
Update ja_JP.lang (#3840)
tento64 Jan 2, 2020
ae0f16b
Full update of pl_PL.lang - thanks to Miomiowski
Miomiowski Jan 2, 2020
fe7f036
Update Russian localizations - add Advancements in 1.12
Romsik788 Jan 2, 2020
afffe8e
Display Screen - performance improvement and attempt to fix #3854.
radfast Jan 3, 2020
5e7c835
Compatibility - sealed IC2 cables compat with latest IC2 and performa…
radfast Jan 4, 2020
d07c033
Merge pull request #3812 from ETStareak/master
micdoodle8 Jan 22, 2020
1864beb
Wafer advancements in en_US
radfast Jan 23, 2020
0bbe23b
Refactor BlockMachines code for simpler code maintenance.
radfast Jan 26, 2020
c90b3ef
Refactor BlockMachines: machine-specific elements moved to the type E…
radfast Jan 26, 2020
b574e20
Refactor BlockMachines: common code moved to BlockMachineBase.
radfast Jan 26, 2020
6278657
Refactor BlockMachines: make constructors the Java 8 way.
radfast Jan 26, 2020
0c3d90d
Refactor BlockMachines: more common code refactored.
radfast Jan 26, 2020
c5a06b6
Refactor BlockMachines: refactor Mars Tier2 machines.
radfast Jan 26, 2020
bfce854
Update: smaller wood items can be smelted to make Fragmented Carbon.
radfast Jan 26, 2020
5857f79
Merge remote-tracking branch 'refs/remotes/micdoodle8/master'
BlesseNtumble Jan 28, 2020
dc9eb64
Update ko_KR.lang (#3872)
mindy15963 Feb 8, 2020
9dfa76d
Update ko_KR.lang (#3873)
mindy15963 Feb 8, 2020
f85e1dd
Update pl_PL.lang (#3870)
Miomiowski Feb 8, 2020
cccca8a
Use "chestWood" Ore Dictionary values rather than hardcoding the item.
marcus8448 Mar 2, 2020
ae9ac10
Merge branch 'pr/3782' into pr/3899
Apr 28, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
9 changes: 6 additions & 3 deletions ISSUE_TEMPLATE
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
REVIEW THE GUIDELINES (LINK AT TOP OF THIS PAGE)
REVIEW THE GUIDELINES - see [Contributing](https://github.com/micdoodle8/Galacticraft/blob/master/CONTRIBUTING.md) link on right side.

Minecraft version:
Galacticraft version:

Single player (SSP), Multiplayer (SMP), or SSP opened to LAN (LAN)?
- If SMP server, please mention if it has **Sponge**, AtomMC, BukkitForge, BungeeCord etc.

Galacticraft add-ons and other mods installed?
Any Galacticraft add-ons installed? please list all

Please provide screenshots / crash report / log as needed.
Please provide screenshots / crash report / log / full modlist as needed

If the game is not starting at all, please confirm that you downloaded from the official Galacticraft download site (https://micdoodle8.com/mods/galacticraft)
67 changes: 37 additions & 30 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
def mcVersion = "1.8.9"
def mcVersion = "1.12.2"
def versionMajor = 4
def versionMinor = 0
def versionRev = 1
def versionRev = 2

// For those who want the bleeding edge
buildscript {
repositories {
jcenter()
maven {
name = "forge"
url = "http://files.minecraftforge.net/maven"
url = "https://files.minecraftforge.net/maven"
}
}
dependencies {
classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT'
classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
}
}
apply plugin: 'net.minecraftforge.gradle.forge'
Expand All @@ -39,31 +39,40 @@ sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8

minecraft {
version = "1.8.9-11.15.1.1764"
version = "1.12.2-14.23.5.2768"
runDir = "run"

// the mappings can be changed at any time, and must be in the following format.
// snapshot_YYYYMMDD snapshot are built nightly.
// stable_# stables are built at the discretion of the MCP team.
// Use non-default mappings at your own risk. they may not allways work.
// simply re-run your setup task after changing the mappings to update your workspace.
mappings = "stable_20"
mappings = "snapshot_20171003"
makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
}

// Keep a list of dependencies files/directories for easy jar packing
ext.dependencies = ['codechicken/**',
'**/nei_at.cfg',
'api/**',
'appeng/**',
'biomesoplenty/**',
'buildcraft/**',
'cofh/**',
'de/**',
'ic2/**',
'mekanism/**',
'mezz/**',
'powercrystals/**']
repositories {
maven {
name = 'curseforge'
url = 'https://minecraft.curseforge.com/api/maven/'
}
maven {
url = "https://mod-buildcraft.com/maven/"
}
}

dependencies {
compile "jei:jei_1.12.2:4.15.0.268"
compile "mekanism:Mekanism-1.12.2:9.4.13.349:api"
compile "applied-energistics-2:appliedenergistics2-rv6:stable:6"
compile "com.github.glitchfiend.biomesoplenty:BiomesOPlenty:1.12.2-7.0.1.2399:universal"
compile "com.mod-buildcraft:buildcraft-api:7.99.21"
compile "redstone-flux:RedstoneFlux-1.12:2.1.0.6:universal"
compile "actually-additions:ActuallyAdditions:1.12.2:r144"
compile "industrial-craft:industrialcraft-2-2.8.109:ex112:api"
compile "player-api:PlayerAPI:1.12.1:1.0"

}

// Keep a list of core files/directories for easy jar packing
ext.apiFiles = ['micdoodle8/mods/galacticraft/api/**']
Expand Down Expand Up @@ -94,7 +103,6 @@ jar
includes.addAll('mcmod.info')
includes.addAll('LICENSE.txt')
includes.addAll('api/player/**')
includes.addAll(project.ext.dependencies)
includes.addAll(project.ext.planetsFiles)
includes.addAll(project.ext.micdoodleCoreFiles)
}
Expand Down Expand Up @@ -132,7 +140,6 @@ task packCoreJar(type: Jar, dependsOn: "rePackAllJarCore") {
includes.addAll('mcmod.info')
includes.addAll('LICENSE.txt')
excludes.addAll(project.ext.planetsFiles)
excludes.addAll(project.ext.dependencies)
excludes.addAll(project.ext.micdoodleCoreFiles)
}
}
Expand All @@ -150,7 +157,6 @@ task packPlanetsJar(type: Jar, dependsOn: "rePackAllJarPlanets") {
includes.addAll('LICENSE.txt')
excludes.addAll(project.ext.coreFiles)
excludes.addAll(project.ext.apiFiles)
excludes.addAll(project.ext.dependencies)
excludes.addAll(project.ext.micdoodleCoreFiles)
}
}
Expand All @@ -168,7 +174,6 @@ task packMicCoreJar(type: Jar, dependsOn: "reobfJar") {
include('micdoodle8/mods/galacticraft/api/entity/IEntityBreathable.class')
excludes.addAll(project.ext.coreFiles)
excludes.addAll(project.ext.planetsFiles)
excludes.addAll(project.ext.dependencies)
}

// Configure manifest attributes
Expand All @@ -187,7 +192,6 @@ task packCoreJarDev(type: Jar, dependsOn: "classes") {
includes.addAll('mcmod.info')
includes.addAll('LICENSE.txt')
excludes.addAll(project.ext.planetsFiles)
excludes.addAll(project.ext.dependencies)
excludes.addAll(project.ext.micdoodleCoreFiles)
}

Expand All @@ -197,7 +201,6 @@ task packCoreJarDev(type: Jar, dependsOn: "classes") {
includes.addAll('mcmod.info')
includes.addAll('LICENSE.txt')
excludes.addAll(project.ext.planetsFiles)
excludes.addAll(project.ext.dependencies)
excludes.addAll(project.ext.micdoodleCoreFiles)
excludes.addAll('assets')
into 'src'
Expand All @@ -222,7 +225,6 @@ task packPlanetsJarDev(type: Jar, dependsOn: "classes") {
includes.addAll('LICENSE.txt')
excludes.addAll(project.ext.coreFiles)
excludes.addAll(project.ext.apiFiles)
excludes.addAll(project.ext.dependencies)
excludes.addAll(project.ext.micdoodleCoreFiles)
}

Expand All @@ -233,7 +235,6 @@ task packPlanetsJarDev(type: Jar, dependsOn: "classes") {
includes.addAll('LICENSE.txt')
excludes.addAll(project.ext.coreFiles)
excludes.addAll(project.ext.apiFiles)
excludes.addAll(project.ext.dependencies)
excludes.addAll(project.ext.micdoodleCoreFiles)
excludes.addAll('assets')
into 'src'
Expand All @@ -253,7 +254,6 @@ task packMicCoreJarDev(type: Jar, dependsOn: "classes") {
excludes.addAll(project.ext.planetsFiles)
excludes.addAll(project.ext.coreFiles)
excludes.addAll(project.ext.apiFiles)
excludes.addAll(project.ext.dependencies)
excludes.addAll('**/*.info')
}

Expand All @@ -264,7 +264,6 @@ task packMicCoreJarDev(type: Jar, dependsOn: "classes") {
excludes.addAll(project.ext.planetsFiles)
excludes.addAll(project.ext.coreFiles)
excludes.addAll(project.ext.apiFiles)
excludes.addAll(project.ext.dependencies)
excludes.addAll('**/*.info')
excludes.addAll('assets')
into 'src'
Expand All @@ -285,13 +284,21 @@ task packApi(type: Jar, dependsOn: "classes") {
// Set the jar's base name
baseName = "Galacticraft-API"

from (sourceSets.main.output) {
includes.addAll(project.ext.apiFiles)
includes.addAll('LICENSE.txt')
excludes.addAll(project.ext.micdoodleCoreFiles)
excludes.addAll(project.ext.planetsFiles)
excludes.addAll('**/*.info')
excludes.addAll('assets')
}

from (sourceSets.main.allSource) {
// Add necessary files, remove unnecessary ones.
includes.addAll(project.ext.apiFiles)
includes.addAll('LICENSE.txt')
excludes.addAll(project.ext.micdoodleCoreFiles)
excludes.addAll(project.ext.planetsFiles)
excludes.addAll(project.ext.dependencies)
excludes.addAll('**/*.info')
excludes.addAll('assets')
}
Expand Down
97 changes: 97 additions & 0 deletions capes-uuid.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
4e0dd4b7c04f4b728bbcd8f1510d9cc7:capeOrange micdoodle8
bba235f5785848a198bc7ccba53a309e:capeLightGray radfast
35282c16cf0a4d8eb5d6e2c2b2af8d25:capeLime JTE
f782663c84ee476188b528c672400477:capeLime Mitchski
1a32606e2e554a68b1bcdef5527a06c9:capeLime TheGookuPJ
a7108076b5e446689e8f38ce170b7c3d:capeLime bob10234
7b87531ac6834a71a531d4216b999077:capeLime Flies_On_Eyes
6b2697befb724476b1366560dad61de5:capeLime CrimsonKMR
7ba60d3f8d3f435a92c59867614ce97f:capeLime _lime
09912f8b02dc43728d0d60ae66d85d7a:capeLime Hachipatas
15a5921d36cf4c139bcee254e2ff2885:capeLime Happypancakes56
0dd8daa9bec74255ba4834911fe70526:capeLime Slke
532a13ec3126453f87a0df16f0eccbad:capeLime Tyroul
3d7c4b45715d4623a9104193996e1900:capeLime kungfu_dragon
9da24e27976441d8accca25da2f1457f:capeLime Lewis_McReu
bc14cd20a79b42fcb6f6eab39ed59036:capeLightGray TheDaveStream
322a906773a343f892998ff9d9ceb336:capeLime RampantDolphin
2228ec9a323a40ddb0e998e65d05608a:capeLime PureTryOut
401af2b734d14a5ea78a9ae81757b9ee:capeLime ramenators
751f7a3bf3ab43e4b5d2352c7a0d7d9a:capeLime randhope21
c3ea848638e146c18f42b2479ac16ea8:capeLime Night_Fury_CZ
c18b17fcae494d93a1db83121dc01bff:capeLime SoaringChris137
58cdd8b69e004a339914666457cf6421:capeLime TerraGenome
2eaac1b2af094a72bf833c462a8f97a4:capeLime Yangjo
80228a058c1345daa5d0ea0fdcb4eb12:capeLime Made_This_Name
7776112e3ade489a9ac183ff5e1cae7a:capeLime spamenigma
a865907c6b8347b2a08835688169dc6a:capeBlue EzerArch
e1d0ee1c42024b8985d9540bac457463:capeOrange GiantWaffle
e7c3e2a33e1a477f9feda46fe674bea8:capeLightBlue Lastnecron
592e9044ec26496e90296a6dcc43d407:capeBlue SpoonTrauma
b31a143466cf4b1eb27640252e0ca974:capeOrange Devsio
a163bd86b3b847788045f11cc1b171bf:capeOrange Tyrantelf
f3a1ea327dd04d0b9759203a4adff99c:capeBlue Cellenseres
47257425c09d44d9846edb042571dbec:capeOrange SgtAce
743392cc83bc49f2bd3eac04ccf69aa9:capeRainbow Roosterteeth546
db9eea4b99e0413297aa5be75010b0ad:capeOrange SundayxFunday
42232dec4ffd458dbee45791c822bd83:capeLime THEproWINN
766cebb7c5684099870976aa5f069538:capeLime Puggy04
cdec6b441de145f8a7d450ff27b48a62:capeRainbow scriptoffate14
cd6eb3ef44c14030812fab39ce53febe:capeRainbow Ohrm
ade5c7958eea4880b5c305eb898dcc99:capeRainbow SirFuzzhead
291f9006916948588960f5f6d06b6e47:capeRed alexljn5
e7a8ff43db5a48f190c2bdd039bea7ef:capeRainbow Tatertot2222
5725dfbd769d4df8981633346b788f36:capeRainbow atomicpichu
c9ba14cd7a8f41cf9e6b13cca78563b7:capeMagenta chattanooga
aca4ca40b5e74d998d24385acaee46f8:capeOrange so2ro
2054059c45d34375b51e60d59303d6e1:capeBlue Sir_Killz
60fbe691d5fd4007b0e85bfe54fbac7b:capeRainbow ForbiddeFan12
d5d826c123904ceb8b55a160345b91e3:capeRainbow takos
c02818a726634132a0eeabc88616d415:capeLime GradeAWizard
8f1c823c9a3b401da0a2f77829cdba33:capeBlue kelvinxj
82419cb6c25b403f8b1fc503340fff15:capeCyan BCQX
055d629e96104dddbad01944ab5f7d29:capeRainbow Shamrocker101
08ca7900afa8474db3bc1147ed61942e:capeLightGray Truman04
ea62f0017661447399c6c5224b5180c9:capeRainbow Krystal_Disc
4f6de754f9ef4462bc756b55094b4f6e:capeLime eggsandbaon
2f6980ebfac448c79021e452fda174f6:capeRainbow Germaniac
bdfd2c1c28964bf4b22e684ac1ed9118:capeCyan ALterRy
ff42d35e94b44933bcb2d482d277f83f:capeCyan nanatorium
cccbf098d8204d119fa9c85a0f92fee0:capeOrange Phlonk
c7b62bb08a7a41f8a9d9812c89ee9c99:capeRainbow AquaBarnes
459f310e70224bffba46cfb8f28c9b01:capeLime CmdrPineapple
9a4668a923d34fa28054820c305bd308:capeDarkGray lancewalker
8ef62b5cd49a4dd3a59a1bfbb3d3d380:capeYellow 1_c
3101ea80b1904de4b556e4b46dde541c:capeDarkGray MoonRaven
21f531d2d0dd4359a0b4ba5d036a0ce7:capeLime Survarium
ba7e73d2cbf54d63858f2d60ae9eaa6b:capeRainbow Daeon
0e585f22f60647e2a2b56ca7196cfa74:capeLightGray dragonguide
9ca6ab76cdf34b13a3f92d36d337567a:capeRainbow MrRobin1512
a0c708a9b5fb4b8299036fc4437c34b9:capeOrange IndianGooN
6bcc4b6a354344cebe6e4de701ba45d1:capeLightBlue Mysticslay
f5f0b2ce0c094ced9c147156a6a205b5:capeYellow BeeCannon
fc9b324e8d0d4c5d8fd6d11d5d042e61:capeRainbow KrazyMonkey
76ae9784cec6448cb3521eed1abf16f9:capeLightBlue Knightblock
1630c57a471e43a6805240d4a3cbbb55:capeRainbow Shadow_Beats
98313813c3f4494fbb4d68f342633a83:capeYellow Strachey
57d64951c09c4f498875d404841efac9:capeLime JacobiCarter
c0e6fa8862d24556902ef49823b96dfe:capeBrown afoolishmoon
ed4bf20f800b4f32b79718ddb1b24d7b:capeRainbow LokeYourLord
c4c022edb98a4337832a5ea8417aea4e:capeRainbow GetVape
fe481dee2e6d4c289fb742fd3db796e2:capeLime ma10as234
0a429b969fb04d9fb34d032ebeb07c9c:capeRainbow ARedHel66
c53ed454efba4dcfa307ba9eb26c58d3:capeLightBlue PrezGman
0de2e5f8917049b6999c5f1fca7d0ad4:capePurple creeperchick15
e4be20006bfb4003b4e5f6dc4f153471:capeBlue sonic5223
34314a92dc5c43a7afa848f101699203:capeRainbow Master_Apple
6a419733b55046d3a21c46656b801849:capePurple urix123
f71b1f8b46574347a74b0d1b0b25659f:capeLime monkeypants_271
c178592112bb4a71b082b422153f267b:capeLightGray Nomad043
1dafe96cb8a34cf6be51367468409943:capePurple Malstrim
504e79e97f4640688611f18075df5c4e:capeCyan WhiskeyOutlaw
09d4c32761504341b145e3048fb13d04:capeRainbow Akahito666
d41727d58ec947f7a8deeabcb2577f9f:capeOrange Timsuper2
6f71c0114d914942904dc9b63326df4c:capeLightGray Sonic_Blender
fab0af0f6890484594745b0c0205d1a6:capeRainbow xX_CreeperMr_Xx
7430428645f54fe8b5aca82bff3f1400:capePurple Santiv
36ab85cc86da42a99172956dfc80edec:capeRainbow SebaSphere
1 change: 1 addition & 0 deletions capes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -103,3 +103,4 @@ Timsuper2:capeOrange
Sonic_Blender:capeLightGray
xX_CreeperMr_Xx:capeRainbow
Santiv:capePurple
SebaSphere:capeRainbow
Loading