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
|
8ccb633925
|
Clean Up
|
2017-06-15 21:27:17 +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 |
|
marcin212
|
b59f541a10
|
Fix extrabees dependencies
|
2017-06-03 17:49:00 +02:00 |
|
Alexander Kornilov
|
c3809fbc27
|
Some reformat code for 1.11.2 source (#84)
* Optimized imports
* Some code reformat
* Some refactoring and code reformat
* Some code reformat
|
2017-06-01 00:48:08 -07:00 |
|
Elec332
|
2dac035df0
|
Separation basically done
|
2017-05-13 22:25:42 +02:00 |
|
Elec332
|
34a9a90ab3
|
Fixed textures, split the alveary stuff, onlt GUI left to do!
|
2017-05-13 17:10:55 +02:00 |
|
Elec332
|
a5e27bfd47
|
Only the client and apiary packages left to do!
|
2017-05-13 11:59:49 +02:00 |
|
Elec332
|
60607354dd
|
Split the proxy from the rest
|
2017-05-12 21:57:54 +02:00 |
|
Elec332
|
1828ad9f3b
|
Packages done: worldgen, utils, items, init, genetics & blocks. Now on to the hard part...
|
2017-05-12 18:13:06 +02:00 |
|
Elec332
|
b12d19c9ea
|
More work on splitting ExtraBees
|
2017-05-12 16:02:25 +02:00 |
|
Elec332
|
ac05f9013a
|
Started on splitting ExtraBees
|
2017-05-12 12:32:53 +02:00 |
|
mezz
|
16b955b443
|
Begin adding stricter null annotations to prepare for 1.11
|
2017-02-05 23:47:40 -08:00 |
|
Nedelosk
|
cef5f4963f
|
Work on GardenLogic and localize the tubes
|
2016-10-30 18:59:39 +01:00 |
|
mezz
|
5bb4b5d9a5
|
Auto-format spaces to tabs (#2)
|
2016-10-27 02:49:49 -07:00 |
|
Nedelosk
|
2a23e60cdb
|
Adding flower blockstate and blockstatemapper
|
2016-10-26 01:32:05 +02:00 |
|
Elec332
|
0f67d73b30
|
Cleanup main mod classes, ran import optimiser
|
2016-10-25 15:13:44 +02:00 |
|
marcin212
|
6801529ca5
|
Working on module apiary
|
2016-10-25 00:00:47 +02:00 |
|
Nedelosk
|
86bde197ec
|
Clean Up
|
2016-10-21 13:40:04 +02:00 |
|
Nedelosk
|
8c61cacb57
|
Add Item models
|
2016-10-21 13:39:50 +02:00 |
|
mezz
|
9812ddc4ce
|
Fix mod names and dependencies
|
2016-10-20 22:38:23 -07:00 |
|
marcin212
|
6a7c4bf67d
|
start 1.10.2
|
2016-10-20 04:32:47 +02:00 |
|
marcin212
|
f969f63b66
|
port to forestry 4.2
|
2016-10-20 02:56:31 +02:00 |
|