gnembon e04a8be9e8 Merge branch 'master' into 1.15 ...

# Conflicts:
#	src/main/java/carpet/script/CarpetExpression.java

2020-02-03 10:58:17 -04:00

..

BlockRotator.java

Merge branch 'master' into 1.15

2019-12-10 23:14:04 -04:00

BlockSaplingHelper.java

moved a bunch of stuff

2019-05-12 01:48:19 -03:00

EntityPlayerActionPack.java

Merge branch 'master' into 1.15

2020-01-10 21:50:20 -04:00

FeatureGenerator.java

Merge branch 'master' into 1.15

2020-02-03 10:58:17 -04:00

HopperCounter.java

fix of stackable sboxes and fix to hopper counters

2019-08-28 13:25:44 -03:00

InventoryHelper.java

Merge branch 'master' into 1.15

2019-10-28 21:55:49 -03:00

OptimizedExplosion.java

Merge branch 'master' into 1.15

2020-01-06 21:28:07 -04:00

ParticleDisplay.java

tweaks to villager breeding tracking

2019-07-29 09:16:08 -03:00

PortalHelper.java

remove a few warnings

2020-01-06 21:26:44 -04:00

RedstoneWireTurbo.java

Merge branch 'master' into 1.15

2020-01-06 21:28:07 -04:00

TickSpeed.java

Renamed establishTickrateLink to addTickrateListener

2020-01-02 22:23:54 +01:00

Tracer.java

player actions

2019-07-17 03:58:16 -03:00

XPcombine.java

1.15.2 pre2 and mappings

2020-01-17 17:36:39 -04:00