mezz
|
125cd54b66
|
Update Forestry version
|
2017-01-03 00:25:27 -08:00 |
|
Nedelosk
|
bebb663768
|
Improve default statemapper
|
2016-11-01 16:52:41 +01:00 |
|
Nedelosk
|
f288984833
|
Merge branch 'master-MC1.10.2' of https://github.com/ForestryMC/Binnie into master-MC1.10.2
|
2016-11-01 16:48:14 +01:00 |
|
Nedelosk
|
9e68539431
|
Start to work on ceramic blocks
|
2016-11-01 16:48:01 +01:00 |
|
marcin212
|
8c9cd7c202
|
Merge branch 'master-MC1.10.2' of https://github.com/ForestryMC/Binnie into master-MC1.10.2
# Conflicts:
# src/main/java/binnie/extratrees/genetics/ExtraTreeSpecies.java
# src/main/java/binnie/extratrees/genetics/ModuleGenetics.java
|
2016-10-31 21:11:27 +01:00 |
|
marcin212
|
8e14eb81a1
|
Rewrite ExtraTreeSpecies class
|
2016-10-31 21:03:38 +01:00 |
|
mezz
|
61f7878acc
|
Cleanup
|
2016-10-30 21:34:53 -07:00 |
|
mezz
|
307374ca2b
|
improve null checks for Mods.java
|
2016-10-30 20:56:24 -07:00 |
|
mezz
|
975309598a
|
Auto-fix formatting
|
2016-10-30 20:56:03 -07:00 |
|
mezz
|
697ccabf53
|
Fix several broken ItemStacks and recipes
|
2016-10-30 19:24:46 -07:00 |
|
Nedelosk
|
cef5f4963f
|
Work on GardenLogic and localize the tubes
|
2016-10-30 18:59:39 +01:00 |
|
mezz
|
c40cdb281f
|
Add Sequencer JEI recipes
|
2016-10-29 01:20:39 -07:00 |
|
mezz
|
7c37c3f126
|
Add Polymeriser JEI recipes
|
2016-10-29 00:17:04 -07:00 |
|
mezz
|
f082500fc0
|
Add Isolator JEI recipes
|
2016-10-28 21:47:06 -07:00 |
|
mezz
|
b6191ab4b0
|
Fix DefaultTankContainer
|
2016-10-28 18:58:14 -07:00 |
|
Nedelosk
|
91933a738b
|
Adding Fluid and Item Capability to the machine tile entity
|
2016-10-28 14:11:28 +02:00 |
|
Nedelosk
|
489ce3dece
|
Clean Up Machines: Genetic
|
2016-10-28 12:43:12 +02:00 |
|
Nedelosk
|
154207f60f
|
Clean Up
|
2016-10-28 02:20:36 +02:00 |
|
Nedelosk
|
6b7b6480c0
|
Start to clean up machines
|
2016-10-28 00:01:33 +02:00 |
|
Nedelosk
|
3bf37f8838
|
Work on things
|
2016-10-27 16:05:15 +02:00 |
|
mezz
|
5bb4b5d9a5
|
Auto-format spaces to tabs (#2)
|
2016-10-27 02:49:49 -07:00 |
|
mezz
|
25be7fd254
|
Complete JEI integration of the Incubator
|
2016-10-27 02:42:11 -07:00 |
|
mezz
|
49542b0851
|
Minor cleanup
|
2016-10-27 02:41:42 -07:00 |
|
marcin212
|
09fa488cff
|
Merge branch 'master-MC1.10.2' of https://github.com/ForestryMC/Binnie into master-MC1.10.2
|
2016-10-27 05:21:18 +02:00 |
|
marcin212
|
c201768ffa
|
Fix sapling rendering
|
2016-10-27 05:20:23 +02:00 |
|
Nedelosk
|
5b4d490e94
|
Remove unused classes
|
2016-10-27 01:13:55 +02:00 |
|
Nedelosk
|
1982cbc615
|
Clean Up
|
2016-10-27 01:12:43 +02:00 |
|
Nedelosk
|
b356c65a73
|
Register Fluid Textures
|
2016-10-27 01:09:37 +02:00 |
|
Nedelosk
|
8a103a72cc
|
Remove Unused Encylopedia
|
2016-10-26 23:59:04 +02:00 |
|
Nedelosk
|
df17dccad7
|
Add Flower Item Models and Flower Double Models
|
2016-10-26 22:01:13 +02:00 |
|
Nedelosk
|
2a23e60cdb
|
Adding flower blockstate and blockstatemapper
|
2016-10-26 01:32:05 +02:00 |
|
Nedelosk
|
5a64454906
|
Clean Up and localise flower tooltip
|
2016-10-25 19:07:29 +02:00 |
|
Nedelosk
|
f993d0571d
|
Merge branch 'master-MC1.10.2' of https://github.com/ForestryMC/Binnie into master-MC1.10.2
|
2016-10-25 18:14:30 +02:00 |
|
Nedelosk
|
7dba116937
|
Working on Flower Models and Update Forestry
|
2016-10-25 18:08:12 +02:00 |
|
Elec332
|
0f67d73b30
|
Cleanup main mod classes, ran import optimiser
|
2016-10-25 15:13:44 +02:00 |
|
Nedelosk
|
9e31a19f34
|
Merge branch 'master-MC1.10.2' of https://github.com/ForestryMC/Binnie into master-MC1.10.2
|
2016-10-25 00:28:35 +02:00 |
|
Nedelosk
|
7ce53b0c23
|
Working on Ceramic and other Botany things
|
2016-10-25 00:28:26 +02:00 |
|
marcin212
|
62a4efaa53
|
Merge branch 'master-MC1.10.2' of https://github.com/ForestryMC/Binnie into master-MC1.10.2
|
2016-10-25 00:01:04 +02:00 |
|
marcin212
|
6801529ca5
|
Working on module apiary
|
2016-10-25 00:00:47 +02:00 |
|
Nedelosk
|
f814808f20
|
Working on Ceramic
|
2016-10-24 23:27:17 +02:00 |
|
Nedelosk
|
9884a13c6e
|
Merge branch 'master-MC1.10.2' of https://github.com/ForestryMC/Binnie into master-MC1.10.2
|
2016-10-24 21:58:05 +02:00 |
|
Nedelosk
|
57494b1f81
|
Working on Gardening
|
2016-10-24 21:57:50 +02:00 |
|
marcin212
|
3a0c551668
|
Add ItemGenesis model
|
2016-10-24 21:56:35 +02:00 |
|
marcin212
|
9d5144ddea
|
Merge branch 'master-MC1.10.2' of https://github.com/ForestryMC/Binnie into master-MC1.10.2
|
2016-10-24 21:35:41 +02:00 |
|
marcin212
|
43efa66c20
|
Move ItemMisc models to subdirectory
|
2016-10-24 21:34:29 +02:00 |
|
Nedelosk
|
9f04dc7ed0
|
Merge branch 'master-MC1.10.2' of https://github.com/ForestryMC/Binnie into master-MC1.10.2
|
2016-10-24 20:26:19 +02:00 |
|
Nedelosk
|
7de922264a
|
Adding new Models
|
2016-10-24 20:25:24 +02:00 |
|
marcin212
|
7e1e92ae2c
|
Decompiler mess cleanup
|
2016-10-24 19:33:53 +02:00 |
|
Nedelosk
|
8b1bce6963
|
Clean Up and start to work on flower models
|
2016-10-22 18:56:37 +02:00 |
|
marcin212
|
59e21d05ef
|
Fix wrong allele name and enable module genetics in botany
|
2016-10-21 15:30:06 +02:00 |
|