mezz
|
96cc1b869c
|
Merge branch 'dev' into 4.2
|
2016-02-11 17:36:46 -08:00 |
|
mezz
|
6cd9f33c3f
|
Close #1060 Close #1065 Disable Growthcraft plugin for version 2.5.0+
|
2016-02-11 17:35:21 -08:00 |
|
Nirek-K
|
7585c6a265
|
Fix #1067 add module checks to BoP Plugin
|
2016-02-11 00:48:38 -06:00 |
|
Nirek-K
|
91a5084bde
|
Further cleanup GC plugin nulls.
|
2016-02-10 15:29:26 -06:00 |
|
Nirek-K
|
0876a50be2
|
Add missing null check to Growthcraft plugin.
|
2016-02-10 08:19:40 -06:00 |
|
mezz
|
1941690330
|
Merge branch 'dev' into 4.2
|
2016-02-01 18:06:09 -08:00 |
|
mezz
|
bbd39ea5c7
|
Fix #1053 NPE when loading with old configs
|
2016-02-01 18:05:51 -08:00 |
|
mezz
|
53f4107ee3
|
Merge branch 'dev' into 4.2
|
2016-01-28 20:38:06 -08:00 |
|
Nirek-K
|
b9478e16b7
|
Add Orchard farmland, dirt traversal for ic2 plants.
|
2016-01-24 15:49:31 -06:00 |
|
Nirek-K
|
2cdee67624
|
Add Carrots equal to Apples in the squeezer(juice/mulch), potatoes at double fermenter rate of wheat (choice between pure fermenting, and seeds for seedoil)
|
2016-01-24 03:35:55 -06:00 |
|
Nirek-K
|
58fe331fe3
|
And missed one in HC too.
|
2016-01-24 03:17:37 -06:00 |
|
Nirek-K
|
a4d5117a97
|
Missed a check in BoP, also fix PlantMegaPack
|
2016-01-24 03:05:27 -06:00 |
|
Nirek-K
|
32a9a6ff5c
|
Fix #1051 Check for Farming module before adding BoP and Harvestcraft crops.
|
2016-01-24 02:19:15 -06:00 |
|
mezz
|
9f2f2ed85b
|
Fix #1043 Crash from mods spawning wood items with wildcard metadata
|
2016-01-15 20:07:54 -08:00 |
|
mezz
|
22258c2dac
|
Merge branch 'dev' into 4.2
|
2016-01-11 07:40:17 -08:00 |
|
mezz
|
e0c1c538aa
|
Fix ClientTickEvent crash on disconnect from server
|
2016-01-10 21:04:35 -08:00 |
|
mezz
|
825768e522
|
Fix naturalist's eye lag on multiplayer servers
|
2016-01-01 11:55:39 -08:00 |
|
mezz
|
dd21d83ea3
|
Merge branch 'dev' into 4.2
|
2015-12-30 04:39:13 -08:00 |
|
mezz
|
1d924d5ed5
|
Merge pull request #1004 from estebes/dev
Add IC2 crops support to multifarms (uses orchard farm logic)
|
2015-12-30 04:37:20 -08:00 |
|
mezz
|
ff7adac9e1
|
Fix #1001 Slabs can't combine on placement in same block
|
2015-12-30 04:34:23 -08:00 |
|
mezz
|
45993f8213
|
Fix #999 Forestry Wood Logs Placement Issue
|
2015-12-30 02:31:19 -08:00 |
|
mezz
|
33573fea20
|
Fix #1022 Indistinguishable pollination color for some tree species
|
2015-12-29 12:34:26 -08:00 |
|
mezz
|
178142bf7a
|
Fix #922 New tree branching generates non-connected logs
|
2015-12-29 11:17:42 -08:00 |
|
mezz
|
5d2aaea757
|
Fix #1008 Backpack superposition bug
|
2015-12-29 09:40:37 -08:00 |
|
mezz
|
fbb02e43f5
|
Limit packets from engines supplying power to nearly full receivers
|
2015-12-29 08:20:05 -08:00 |
|
mezz
|
896767ae1b
|
auto format
|
2015-12-23 23:06:45 -08:00 |
|
mezz
|
d11034e4aa
|
Merge branch 'dev' into 4.2
|
2015-12-22 17:47:29 -08:00 |
|
mezz
|
cc64b09ad4
|
Fix #1017 crash when accessing bee cart gui
|
2015-12-22 17:44:38 -08:00 |
|
mezz
|
d5ebc02999
|
Fix BreedingTracker crash
|
2015-12-19 16:02:08 -08:00 |
|
mezz
|
8415b657f2
|
Use Forge 10.13.4.1566 fuel burn time workaround.
Fix #960 Fireproof wood have fuel value,
Fix #469 Burn time of wooden slabs should be 150 ticks
|
2015-12-13 13:47:55 -08:00 |
|
mezz
|
f0099b728f
|
Merge branch 'dev' into 4.2
|
2015-12-12 22:52:38 -08:00 |
|
mezz
|
1ceccddbd0
|
Fix sync issues with researched mutations, use smaller packets
|
2015-12-12 22:51:59 -08:00 |
|
mezz
|
c875e8ed5d
|
Merge branch 'dev' into 4.2
|
2015-12-12 18:10:38 -08:00 |
|
mezz
|
c2437a8a13
|
Fix #1009 Minor fluid dupe on right-clicking nearly-full machine
|
2015-12-12 18:08:40 -08:00 |
|
mezz
|
e2f32ab767
|
Sync mail to client on login, do not display mail indicator on logout
|
2015-12-12 17:45:12 -08:00 |
|
mezz
|
d0c8c92863
|
Fix #1010 Automatically sync breeding trackers to client
|
2015-12-12 17:27:18 -08:00 |
|
Nirek-K
|
a8c84cfcf9
|
Possibly fix IE plugin loading too early, add small RotaryCraft plugin.
|
2015-12-11 12:06:28 -06:00 |
|
mezz
|
8f8f6a05f7
|
Fix #1006 Farm Block Recipes broken
|
2015-12-09 14:43:58 -08:00 |
|
mezz
|
721c8fd0ad
|
Make AlleleEffectFertile only tick IGrowable and IPlantable
|
2015-12-08 18:22:16 -08:00 |
|
estebes
|
962a17494c
|
Added IC2 crops support to multifarms (uses orchard farm logic)
|
2015-12-05 11:10:34 +00:00 |
|
mezz
|
01e43d8a18
|
#987 Use fluid names instead of IDs
|
2015-12-03 12:19:04 -08:00 |
|
mezz
|
4228ef73d7
|
Merge branch 'dev' into 4.2
|
2015-12-03 11:29:37 -08:00 |
|
mezz
|
6b9614bccd
|
Fix #994 Peat-fired Engine no longer accepts Bituminous Peat
|
2015-12-03 10:07:51 -08:00 |
|
mezz
|
179311a390
|
Use 2 render passes for saplings (for addon saplings via tree api)
|
2015-12-03 10:02:08 -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
|
347e0a61e1
|
Fix #986 Forestry version of acacia sapling cannot be obtained
|
2015-11-26 20:15:12 -08:00 |
|
mezz
|
23792a84c1
|
Fix #983 farm block recipes are missing for most materials
|
2015-11-25 12:11:15 -08:00 |
|
mezz
|
b4c0777f1c
|
minor cleanup
|
2015-11-22 10:10:09 -08:00 |
|
mezz
|
db5daf9e3d
|
Tidy species code
|
2015-11-21 21:50:38 -08:00 |
|