Mc1.10 - #2

Open

137717unity wants to merge 668 commits into

luc78as:MC1.10from

137717unity:MC1.10

This pull request is big! We're only showing the most recent 250 commits

Commits on Jun 25, 2018

Commits on Jun 30, 2018

Compatibility - add Thermal Expansion fuel compatibility.
radfast
committed
e364e10

Commits on Jul 20, 2018

Update ko_KR.lang
mindy15963
authored
5e9590b
Update ko_KR.lang
mindy15963
authored
d5489ee

Commits on Jul 21, 2018

Update ko_KR.lang
mindy15963
authored
ce669c4
Update ko_KR.lang
mindy15963
authored
10336eb
Update ko_KR.lang
mindy15963
authored
1332b5d
Update ko_KR.lang
mindy15963
authored
2806e4c
Update ko_KR.lang
mindy15963
authored
8479ea7
Update ko_KR.lang
mindy15963
authored
7635beb

Commits on Aug 26, 2018

Update ru_RU.lang
Алексей
authored
2d0f782

Commits on Sep 4, 2018

Commits on Dec 1, 2018

Update New Issue template
radfast
authored
5111788

Commits on Dec 2, 2018

Fix rare client crash when two add-ons conflict. Close #3534.
radfast
committed
ddc51f0
Fix rare crash relating to Sensor Glasses and leak tracing. Fix #3560.
radfast
committed
ac576ec
Fix crash with Volcanic Pickaxe on unique blocks in 1.10+. Fix #3535.
radfast
committed
dbb08ff
Fix some issues with Display Screen connections. Fix #3520.
radfast
committed
de1f45d
Fix night vision potion item (#3425)

SteveKunG
authored and
radfast
committed
e02ebdf
API - add new IArmorCorrosionResistant - thanks to @BlesseNtumble. See #3481.
radfast
committed
8a08b9d
New feature: Achievements for 1.8 through 1.11 (#3526)

marcus8448
authored and
radfast
committed
d64d6d5
Restore degrees symbol in en_US language file after last commit.
radfast
committed
855aa6a
New feature: Advancements [1.12 version of Achievements] (#3527)

marcus8448
authored and
radfast
committed
a6a7d71
Adjust player y-position after Short Range Teleport. Fix #3509.
radfast
committed
f68fa4d
Merge upstream changes.
radfast
committed
dd36e46
Merge upstream changes.
radfast
committed
fec03fc
Advancements in 1.12 - changed lang labels to same as 1.11.
radfast
committed
c57d3c4
Merge upstream changes.
radfast
committed
6e25719
Fix degrees symbol in 1.12 lang file (changed in prev commit)
radfast
authored
4cad7f5
Prevent rare crashes when map corrupted for non-GC reasons.
radfast
committed
260fa7b

Commits on Dec 10, 2018

Update Russian translation
QuantumStatement
committed
b7b46af
Update Russian translation
QuantumStatement
committed
1ea1fe0

Commits on Dec 16, 2018

Update MinecraftForge Maven URL
micdoodle8
authored
952976f

Commits on Dec 28, 2018

Commits on Dec 29, 2018

Commits on Dec 30, 2018

Commits on Dec 31, 2018

For Achievements
ETStareak
authored
13c97a8
Update zh_CN.lang
ETStareak
authored
f852c74

Commits on Jan 5, 2019

Merge pull request #3589 from ETStareak/master
micdoodle8
authored
03de867

Commits on Jan 6, 2019

Merge upstream changes
micdoodle8
committed
11e0b09
Merge upstream changes
micdoodle8
committed
7cbc5d0
Merge upstream changes
micdoodle8
committed
4a73eb2

Commits on Jan 7, 2019

Fix recipe registration location. Credit to @MJRLegends.
micdoodle8
committed
1749829

Commits on Jan 8, 2019

Fix bubble distributor not working after death. Fixes #1718. Fixes #3561.
micdoodle8
committed
fa022a5
Fix display screen connections. Fixes #3599.
micdoodle8
committed
9988a4e
Fix crash in dev environment
micdoodle8
committed
f621f06

Commits on Jan 9, 2019

Fix moon rock appearing as copper ore in inventory.
micdoodle8
committed
f5707c7
Merge upstream changes
micdoodle8
committed
8fa3d4a
Merge upstream changes
micdoodle8
committed
08db244
Fix errors after merge
micdoodle8
committed
8adc75b
Merge upstream changes
micdoodle8
committed
679ba24
Fix crash when breaking some blocks with volcanic pickaxe. Fixes #3566.
micdoodle8
committed
f3e7127
Fix OxygenUtil itemstack checks. Fixes #3601.
micdoodle8
committed
3643490
Add helper method for MicdoodleCore
micdoodle8
committed
2cb988d
Update version number
micdoodle8
committed
1d1d641
Merge upstream changes
micdoodle8
committed
d5be2ae
Merge branch 'MC1.10' into MC1.11
micdoodle8
committed
e4e8fde
Merge branch 'MC1.11' into MC1.12
micdoodle8
committed
00382d6

Commits on Jan 12, 2019

New feature: Solar Arrays. Credit to @EzerArch for idea & textures.
micdoodle8
committed
c3be1f3
Merge upstream changes
micdoodle8
committed
99bbded
Merge upstream changes
micdoodle8
committed
153272b
Merge upstream changes
micdoodle8
committed
b4e7046
Solar Array tweaks
micdoodle8
committed
b1ee4ca
Merge upstream changes
micdoodle8
committed
137d825
Merge upstream changes
micdoodle8
committed
3faf5ef
Merge upstream changes
micdoodle8
committed
bac440e
Update ru_RU.lang
Romsik788
authored
9586566
Fix crash when placing solar array controller. Fixes #3607.
micdoodle8
committed
b39f44b
Merge branch 'master' into MC1.10
micdoodle8
committed
93784db
Merge branch 'MC1.10' into MC1.11
micdoodle8
committed
3286bc6
Merge branch 'MC1.11' into MC1.12
micdoodle8
committed
b026177
Merge pull request #3609 from Romsik788/patch-1
micdoodle8
authored
14d3b20

Commits on Jan 13, 2019

Commits on Jan 14, 2019

Update "versionRev" to 2
marcus8448
authored
f5dadc1

Commits on Jan 15, 2019

Fix NASA Workbench recipes accepting null itemstacks.
micdoodle8
committed
71ed048
Merge pull request #3612 from marcus8448/master
micdoodle8
authored
2343542

Commits on Jan 16, 2019

Merge branch 'master' into MC1.10
micdoodle8
committed
6f1bb81
Fix error in previous commit
micdoodle8
committed
151feda
Merge branch 'MC1.10' into MC1.11
micdoodle8
committed
672739a
Merge branch 'MC1.11' into MC1.12
micdoodle8
committed
0526541

Commits on Feb 4, 2019

Use maven repos instead of dependencies/ folder
marcus8448
committed
585ad61
Remove unnecessary tab/space formatting
marcus8448
authored
3f8a5fc
Stop creating source jars
marcus8448
authored
9a9af19

Commits on Mar 12, 2019

Fix solar arrays crash. Fixes #3641.
micdoodle8
committed
3eda832

Commits on Mar 14, 2019

Merge upstream changes
micdoodle8
committed
7f739e0
Merge branch 'MC1.10' into MC1.11
micdoodle8
committed
a54df64
Merge branch 'MC1.11' into MC1.12
micdoodle8
committed
4280a96

Commits on Mar 17, 2019

Merge pull request #3630 from marcus8448/MC1.12
micdoodle8
authored
7926c34

Commits on Mar 27, 2019

Fix build script errors
micdoodle8
committed
33af6a3

Commits on Mar 28, 2019

Commits on Mar 30, 2019

Tweak dungeon length
micdoodle8
committed
b475eee

Commits on Apr 25, 2019

UUID Capes
marcus8448
committed
86e42d7
Remove debug logging
marcus8448
committed
3588dd6
Update cs_CZ.lang
martinm236
authored
427ce61

Commits on May 8, 2019

Update fr_FR.lang
Dawn7293
authored
7a17301

Commits on Jun 10, 2019

Merge pull request #3686 from MosquitoFRA/patch-1
micdoodle8
authored
f1313d2
Merge pull request #3677 from martinm236/patch-6
micdoodle8
authored
810346f
Merge pull request #3676 from marcus8448/uuid-capes
micdoodle8
authored
333cc4c
Fix railcraft crash with invalid item. Fixes #3671
micdoodle8
committed
286e89f
Merge branch 'master' of https://github.com/micdoodle8/Galacticraft
micdoodle8
committed
5eae85b
Sapphire Ore can be smelted into Sapphires. Fixes #3668.
micdoodle8
committed
be1701d
Fix NPE related to energy transmitters. Fixes #3700.
micdoodle8
committed
f5bb40b

Commits on Jun 12, 2019

Fix crash if AE2 dusts are disabled. Fixes #3680.
micdoodle8
committed
6616e7f

Commits on Jun 25, 2019

Update zh_CN.lang
ETStareak
authored
1c04a3d
Update zh_CN.lang
ETStareak
authored
e22c070

Commits on Jul 2, 2019

Readability refactoring: Gave meaningful names to var2 - var15
hypehuman
committed
0306e23

Commits on Jul 4, 2019

Better Readme
marcus8448
committed
595950b
Fix 'contributing'
marcus8448
committed
51034b0

Commits on Jul 10, 2019

Update ClientProxyCore.java
marcus8448
committed
abd33fe

Commits on Jul 17, 2019

Fixed small bug with DataParameter in EntityMeteor
SteveKunG
authored
e477dfd

Commits on Jul 18, 2019

Item Handlers
micdoodle8
committed
a4fe67c
Merge pull request #3708 from ETStareak/master
micdoodle8
authored
7b02e8b
Merge pull request #3714 from hypehuman/hypehuman-rename
micdoodle8
authored
ab73fe1
Merge pull request #3717 from marcus8448/BetterReadme
micdoodle8
authored
ea85f7c
Merge pull request #3721 from marcus8448/Debug-Log-Cape-Cleanup
micdoodle8
authored
a293221
Allow addons to change oxygen collector sensitivity. Fixes #3724.
micdoodle8
committed
b181dc3
Merge pull request #3725 from SteveKunG/patch-1
micdoodle8
authored
f35b5e1
Remove final modifier from recent change
micdoodle8
committed
a54dd66
Merge branch 'master' of https://github.com/micdoodle8/Galacticraft
micdoodle8
committed
fdedd28

Commits on Jul 20, 2019

Commits on Jul 21, 2019

Commits on Jul 23, 2019

Fix telepad range. Fixes #3734.
micdoodle8
committed
56142da

Commits on Jul 24, 2019

Commits on Jul 25, 2019

Update ko_KR.lang
mindy15963
authored
c912e0e
Update ko_KR.lang
mindy15963
authored
e49c59d
Update ko_KR.lang
mindy15963
authored
8123bd5

Commits on Jul 26, 2019

Commits on Jul 27, 2019

Fix typo in last PR
micdoodle8
committed
2d48bc4
Fix platform item model. Fixes #3703.
micdoodle8
committed
a8c7f56
Attempt to fix a network crash. Fixes #3715. Fixes #3710.
micdoodle8
committed
d25722c

Commits on Jul 28, 2019

Fix arc furnace, actually this time. Fixes #3745.
micdoodle8
committed
386e75a
Fixed Creeper Boss ignore /kill command
SteveKunG
authored
39c9514
Merge pull request #3746 from SteveKunG/patch-1
micdoodle8
authored
748afa9
Better map sensitivity. Thanks @SteveKunG.
micdoodle8
committed
bc99a5c
Fix solar array crash. Fixes #3747.
micdoodle8
committed
11c3385
Merge branch 'master' of https://github.com/micdoodle8/Galacticraft
micdoodle8
committed
004dab2

Commits on Aug 9, 2019

Simplify celestial map a little bit. Fixes #3758.
micdoodle8
committed
84ef5ac

Commits on Aug 12, 2019

Fix broken NASA workbench recipes. Fixes #3763.
micdoodle8
committed
03d7e6c
Fix telepad NBT crash
micdoodle8
committed
fe94b85
Fix meteors not spawning after hitting vertical walls. Fixes #3713.
micdoodle8
committed
a7cfed1

Commits on Aug 24, 2019

Add an option to disable small asteroids entirely
marcus8448
committed
119b2bd
Make the buggy hitbox smaller
marcus8448
committed
38c46e2
Remove blank comments
marcus8448
authored
15da72c

Commits on Aug 25, 2019

New Feature: Laser Turrets
micdoodle8
committed
b066c99
Fix log spam when rendering hand waving. Fixes #3770.
micdoodle8
committed
1d8cdfc
Laser Lighting Improvement, Using GlStateManager
SteveKunG
authored
f13c6ed
Merge pull request #3774 from SteveKunG/patch-1
micdoodle8
authored
4ff8165
Merge pull request #3772 from marcus8448/buggy-hitbox
micdoodle8
authored
ed5ea2e
Merge pull request #3771 from marcus8448/disable-asteroid-config
micdoodle8
authored
f672c33
Update zh_CN.lang
ETStareak
authored
2a2f6a5
Refactor to reduce longest sourcefile path lengths
radfast
committed
d8ecccc

Commits on Aug 26, 2019

Fix space stations with gravity not loading. Fixes #3766.
micdoodle8
committed
6e92255
Update zh_CN.lang
ETStareak
authored
d6c9e90
Attempt to fix long-standing bug when running in Sponge. Fix #3775
radfast
committed
0655b0e
Attempt to fix rare concurrency issues client-side. Fix #3767.
radfast
committed
ce36c4e
Better logging of Biome ID conflicts. Fix #3753
radfast
committed
f562644
Fix rare ticking world entities crash with Arc Lamp. Fix #3704
radfast
committed
a5268e7

Commits on Aug 27, 2019

Merge pull request #3776 from ETStareak/master
micdoodle8
authored
fbb5c29
Include .class files in API jar
micdoodle8
committed
2c84cf6

Commits on Aug 29, 2019

Fix rare rain-sound related crashes on Venus. Fix #3777.
radfast
committed
0a1a715
Vacuum Glass - reset colors on world change. Fix #3709.
radfast
committed
2a1f2b7

Commits on Aug 30, 2019

Astrominers - correctly stay loaded even far from player. Fix #3643.
radfast
committed
e45bc29

Commits on Aug 31, 2019

Commits on Sep 1, 2019

Fix new Biome ID conflict reporting on dedicated server.
radfast
committed
13be525

Commits on Sep 10, 2019

Commits on Sep 14, 2019

Compatibility - no more EnderIO Liquid Conduit warnings with Oxygen consumers. Fix #3794.
radfast
committed
ba67bb6

Commits on Sep 16, 2019

Compatibility - add compatibility with mchorse Metamorph mod. Fix #3791.
radfast
committed
a7244cd

Commits on Sep 22, 2019

Update ISSUE_TEMPLATE
radfast
authored
3a2818e

Commits on Oct 1, 2019

Fix bug checking sealed spaces near y=0 or 255. See #3802.
radfast
committed
0d3fadf

Commits on Oct 17, 2019

Fix dedicated server crash with Laser Turret placement. Fix #3795.
radfast
committed
5d6faa2
Compatibility: improve IC2 Classic energy compatibility. Close #3800.
radfast
committed
a80679f
Oxygen Sealer - slight performance improvement and attempt to resolve #3802.
radfast
committed
7105e3b
Compatibility - add Forge Energy output to GC power producers, improve EnderIO compatibility. Fix #3809.
radfast
committed
7f71833
Add Galacticraft advancements - credit to marcu8448

marcus8448
authored and
radfast
committed
a299777

Commits on Oct 18, 2019

Advancements - criteria registration was not visible in older Forge builds.
radfast
committed
d2fe150
Attempt to resolve rare race condition when loading side-configurable machines from saves. See #3767.
radfast
committed
7a7264d
Bugfix - Cargo Loaders and Unloaders now sensitive to item NBT data. Fix #3804
radfast
committed
1c6510a
Update zh_CN.lang
ETStareak
authored
7e14a03
Update zh_CN.lang
ETStareak
authored
fffb271
Update en_US.lang
ETStareak
authored
06bb468

Commits on Oct 19, 2019

Update en_US.lang
ETStareak
authored
8fb14dc

Commits on Oct 22, 2019

Update en_US.lang
ETStareak
authored
c3e272d

Commits on Oct 23, 2019

Update en_US.lang
ETStareak
authored
afd5a5a

Commits on Nov 14, 2019

Update ja_JP.lang (#3824)

shino-shino16g
authored and
radfast
committed
66e1cb1

Commits on Jan 2, 2020

General Advancement Fixes/Improvements. Fix #3828. Fix #3837. Fix #3844

marcus8448
authored and
radfast
committed
fd574d1
fixed fuel input texture (#3838)

Ezoteric
authored and
radfast
committed
b99f3ff
Update ja_JP.lang (#3840)

tento64
authored and
radfast
committed
434503e
Full update of pl_PL.lang - thanks to Miomiowski

Miomiowski
authored and
radfast
committed
ae0f16b
Update Russian localizations - add Advancements in 1.12

Romsik788
authored and
radfast
committed
fe7f036

Commits on Jan 3, 2020

Display Screen - performance improvement and attempt to fix #3854.
radfast
committed
afffe8e

Commits on Jan 4, 2020

Compatibility - sealed IC2 cables compat with latest IC2 and performance increase. Fix #3825.
radfast
committed
5e7c835

Commits on Jan 22, 2020

Merge pull request #3812 from ETStareak/master
micdoodle8
authored
d07c033

Commits on Jan 23, 2020

Wafer advancements in en_US
radfast
authored
1864beb

Commits on Jan 26, 2020

Commits on Jan 28, 2020

Merge remote-tracking branch 'refs/remotes/micdoodle8/master'
BlesseNtumble
committed
5857f79

Commits on Feb 8, 2020

Update ko_KR.lang (#3872)
mindy15963
authored
dc9eb64
Update ko_KR.lang (#3873)
mindy15963
authored
9dfa76d
Update pl_PL.lang (#3870)
Miomiowski
authored
f85e1dd

Commits on Mar 2, 2020

Use "chestWood" Ore Dictionary values rather than hardcoding the item.
marcus8448
committed
cccca8a

Commits on Apr 28, 2020

Merge branch 'pr/3782' into pr/3899
unity
committed
ae9ac10