marcin212
|
2a873e8bfb
|
Merge branch 'master-MC1.11.2' of https://github.com/ForestryMC/Binnie into master-MC1.11.2
# Conflicts:
# src/main/java/binnie/extrabees/worldgen/ExtraBeesWorldGenerator.java
# src/main/java/binnie/extrabees/worldgen/WorldGenHiveNether.java
|
2017-06-16 12:49:49 +02:00 |
|
marcin212
|
6968ebed3f
|
Added marble bees #36
|
2017-06-16 12:46:38 +02:00 |
|
Nedelosk
|
88c7daf024
|
Move drain input fluid from onFinishTask to onUpdate
|
2017-06-16 00:58:03 +02:00 |
|
Nedelosk
|
b3e514355b
|
Fix #119 Infinity Alcohol crafting and some other brewery bugs
|
2017-06-16 00:54:46 +02:00 |
|
Nedelosk
|
10e641506e
|
Optimize imports
|
2017-06-15 23:11:48 +02:00 |
|
Nedelosk
|
f1df70aeec
|
Fix #98 Analyzer doesn't add researched data to the tracker.
|
2017-06-15 23:06:19 +02:00 |
|
marcin212
|
0d35e58106
|
Added flower farm harvesting logic #126
|
2017-06-15 22:44:50 +02:00 |
|
Nedelosk
|
ae1168ea60
|
Fixed Compartment dupe bug
|
2017-06-15 22:41:54 +02:00 |
|
Nedelosk
|
a91c578829
|
Add ic2 energy support back to power components
|
2017-06-15 22:26:30 +02:00 |
|
Nedelosk
|
7ac50de818
|
Add ic2 energy support back to IPoweredMachine
|
2017-06-15 22:18:50 +02:00 |
|
Nedelosk
|
a61b6c9397
|
Add modelmanager back
|
2017-06-15 21:33:26 +02:00 |
|
Nedelosk
|
8ccb633925
|
Clean Up
|
2017-06-15 21:27:17 +02:00 |
|
Nedelosk
|
96a747518e
|
Remove license header from IItemModelProvider
|
2017-06-15 21:16:59 +02:00 |
|
Nedelosk
|
31d0a03d3f
|
Clean Up and fix some bugs
|
2017-06-15 21:15:09 +02:00 |
|
Nedelosk
|
ef371173c9
|
Make the honey crystal to a energy storage
|
2017-06-15 19:41:41 +02:00 |
|
Nedelosk
|
d460bcab77
|
Clean Up ModuleItems and add two fluid names to ManagerLiquid
|
2017-06-15 17:08:13 +02:00 |
|
Nedelosk
|
c5d0520299
|
Fix #23 Corn recipe yields barley grain
|
2017-06-15 16:45:32 +02:00 |
|
marcin212
|
bf40504ddf
|
Fixed spawn fruit block
|
2017-06-14 15:20:26 +02:00 |
|
marcin212
|
e0ab7a89cc
|
Removed null parameter
|
2017-06-14 15:18:09 +02:00 |
|
marcin212
|
24fd7e89d3
|
Updated Forge, Forestry and JEI
|
2017-06-14 12:59:26 +02:00 |
|
marcin212
|
287b1a5b10
|
Clean up
|
2017-06-14 12:58:32 +02:00 |
|
marcin212
|
81a2268e1d
|
Fixed synchronization with container
|
2017-06-13 13:12:18 +02:00 |
|
marcin212
|
7ddd7d976e
|
Fixed selecting distillery level
|
2017-06-13 11:36:52 +02:00 |
|
marcin212
|
d43d770024
|
Fixed drop of Corrosive bees
|
2017-06-11 20:35:11 +02:00 |
|
marcin212
|
876b214a97
|
Fixed leaves
|
2017-06-11 16:38:49 +02:00 |
|
marcin212
|
57eea26c1a
|
Fixed creative Gene Database
|
2017-06-09 23:19:01 +02:00 |
|
marcin212
|
a5019da906
|
Merge branch 'master-MC1.11.2' of https://github.com/ForestryMC/Binnie into master-MC1.11.2
|
2017-06-09 21:08:39 +02:00 |
|
marcin212
|
0b3dbe6ef5
|
Fixed NPE caused by missing FlowerAlyzerPlugin
|
2017-06-09 21:07:45 +02:00 |
|
marcin212
|
c4db4fa664
|
Fixed missing textures for leaves
|
2017-06-09 20:43:53 +02:00 |
|
marcin212
|
99cef245d0
|
Fix flower rendering after reconnect.
|
2017-06-08 12:04:31 +02:00 |
|
marcin212
|
97a2b939cf
|
Fixed flower tooltip formatting
|
2017-06-08 11:51:32 +02:00 |
|
marcin212
|
3ebb628a56
|
Fixed Fluid duplication in Incubator #103
|
2017-06-08 11:08:33 +02:00 |
|
marcin212
|
0c64d703d8
|
Fixed garden logic crash
|
2017-06-07 21:03:40 +02:00 |
|
marcin212
|
852c9a9a3e
|
Fixed Player inventory in Gene Bank
|
2017-06-07 17:57:48 +02:00 |
|
marcin212
|
87ac2c18a3
|
Fixed rendering in MasterRegistry
|
2017-06-07 16:22:54 +02:00 |
|
marcin212
|
3aa8fb19c7
|
Added Nonnull
|
2017-06-07 16:22:19 +02:00 |
|
marcin212
|
ab03f3f734
|
Fixed Crash when placing flower on soil #104
|
2017-06-07 15:38:05 +02:00 |
|
marcin212
|
9fb03893b2
|
Fixed wrong import
|
2017-06-05 23:50:28 +02:00 |
|
marcin212
|
e6b087319c
|
Fixed #101 TileEntityMachine has throw an exception trying to write state.
|
2017-06-05 23:19:21 +02:00 |
|
marcin212
|
aa567e190e
|
remove unsed import
|
2017-06-05 21:57:04 +02:00 |
|
marcin212
|
6907f4159e
|
Fixed incubator recipes
|
2017-06-05 21:56:47 +02:00 |
|
marcin212
|
dc2c63c856
|
Fixed Inoculator don't need Bacteria Vector to process #66
|
2017-06-05 21:06:30 +02:00 |
|
marcin212
|
dde90817d7
|
Fixed progress texture for Acclimatiser
|
2017-06-05 20:44:43 +02:00 |
|
marcin212
|
559ab4176d
|
Fixed wrong texture in WindowPolymeriser
|
2017-06-05 20:21:11 +02:00 |
|
marcin212
|
5f234cc94e
|
Fixed IndexOutOfBoundsException when crafting in 2x2 grid
|
2017-06-05 20:07:07 +02:00 |
|
marcin212
|
3936c0d377
|
Removed unused imports
|
2017-06-05 19:50:15 +02:00 |
|
marcin212
|
9fae7c1866
|
Fixed Sequencer progress control
|
2017-06-05 19:44:54 +02:00 |
|
marcin212
|
814b717aaf
|
Fixed crash caused by opening Registry
|
2017-06-05 19:41:52 +02:00 |
|
marcin212
|
314e632e47
|
Fixed rotating block design
|
2017-06-05 19:39:56 +02:00 |
|
marcin212
|
e1fbb78c8a
|
Fixed world generating lag
|
2017-06-05 19:38:45 +02:00 |
|