Merge branch 'dev' into 4.2

2026-10-27 06:43:57 +00:00 · 2016-02-11 17:36:46 -08:00 · 2016-02-01 18:06:09 -08:00 · 2016-01-28 20:38:06 -08:00 · 2016-01-11 07:40:17 -08:00 · 2015-12-30 04:39:13 -08:00
1 changed files with 0 additions and 1 deletions
@@ -148,7 +148,6 @@ public abstract class SpeciesRoot implements ISpeciesRoot {
 		return chromosomes;
 	}

-	/* BREEDING TRACKER */
 	@Override
 	public void syncBreedingTrackerToPlayer(EntityPlayer player) {
 		getBreedingTracker(player.worldObj, player.getGameProfile()).synchToPlayer(player);
Author	SHA1	Message	Date
mezz	96cc1b869c	Merge branch 'dev' into 4.2	2016-02-11 17:36:46 -08:00
mezz	1941690330	Merge branch 'dev' into 4.2	2016-02-01 18:06:09 -08:00
mezz	53f4107ee3	Merge branch 'dev' into 4.2	2016-01-28 20:38:06 -08:00
mezz	22258c2dac	Merge branch 'dev' into 4.2	2016-01-11 07:40:17 -08:00
mezz	dd21d83ea3	Merge branch 'dev' into 4.2	2015-12-30 04:39:13 -08:00
mezz	d11034e4aa	Merge branch 'dev' into 4.2	2015-12-22 17:47:29 -08:00
mezz	f0099b728f	Merge branch 'dev' into 4.2	2015-12-12 22:52:38 -08:00
mezz	c875e8ed5d	Merge branch 'dev' into 4.2	2015-12-12 18:10:38 -08:00
mezz	4228ef73d7	Merge branch 'dev' into 4.2	2015-12-03 11:29:37 -08:00
mezz	d8bcab07ba	Use 2 render passes for saplings (for addon saplings via tree api)	2015-12-03 10:01:27 -08:00
mezz	2368f05778	Merge branch 'dev' into 4.2	2015-12-03 10:00:08 -08:00
mezz	9c532dd076	Allow hotkeys to send items to hotbar, except locked slots	2015-11-20 12:04:49 -08:00
mezz	3de8bac1ad	Update minimum required Forge version to 10.13.4.1448 (cherry picked from commit `4c41d0bb6e`)	2015-11-20 10:18:08 -08:00
mezz	abca8b13f3	Fix #972 tree growing logs with default properties instead using genome (cherry picked from commit `67a7185261`) Conflicts: src/main/java/forestry/arboriculture/genetics/TreeDefinition.java	2015-11-20 10:17:51 -08:00