Commit Graph
165 Commits
Author SHA1 Message Date
mezz e9809238de Fix #1325 Null Pointer Exception from broken mailbox 2016-06-18 16:14:13 -07:00
mezz 04cb58dfa2 Use FluidRegistry Water and Lava 2016-06-16 14:38:12 -07:00
mezz af5cb93689 Use ModelBakery directly, less layers of abstraction 2016-06-16 13:58:03 -07:00
mezz f6786cd44a Fix #1289 Trade station price can show a negative stack in catalog 2016-06-13 23:08:34 -07:00
mezz b444994b81 Update for Minecraft 1.9.4 2016-05-26 01:42:46 -07:00
mezz 55c32a8280 Close #1212 Use OreDictionary to choose a type of Copper/Tin/Bronze 2016-05-24 02:14:55 -07:00
mezz 30aea48952 Fix #1189 mail carrier sprites limit texture map's mip level 2016-05-23 17:23:20 -07:00
mezz ff1ff5ae2c Put Facing on blockstate not Tile. Use one block per type for BlockBase 2016-05-18 23:44:03 -07:00
Nedelosk 8299fe3a75 CleanUP, Fix #1175 Germling Texture swap, Fix #1166 Raintank not doing it's job, Fix #1165 Circuit board recipes missing from JEI 2016-05-15 09:57:59 +02:00
mezz 7403a6cdcd Use new block and item registration 2016-05-06 17:27:16 -07:00
Nedelosk 898860975a CleanUp, improven Crate Model, and add IModelState parameter to the model baker 2016-05-06 19:00:58 +02:00
mezz 7bf554b024 Compiles for 1.9! Very buggy, some things are missing. 2016-05-05 01:11:21 -07:00
mezz 5d74c1254b More porting to 1.9 2016-05-04 21:15:23 -07:00
mezz a0cdaf1e1a More porting to 1.9 2016-05-04 01:02:43 -07:00
mezz 73c2608848 First steps porting to 1.9 2016-05-03 00:26:28 -07:00
mezz 77b1d2a283 Fix lighting of the mail indicator 2016-05-01 13:15:57 -07:00
mezz 92460d1d4a Fix #1052 and #1097 bad error messages from Trade Station 2016-05-01 12:52:00 -07:00
mezz 1d8f2dae66 Use Translator.java for all translation 2016-04-30 02:32:44 -07:00
mezz 1b24ba1e5c Use GlStateManager, fix up OpenGL issues 2016-04-26 18:32:31 -07:00
mezz 64cf622ccf Use names for Electron Tube UIDs instead of meta values 2016-04-26 16:31:26 -07:00
Nedelosk 86a93b29c0 Add greenhouse hatch and add IItemHandler integreation, thanks to CovertJaguar 2016-03-16 23:20:33 +01:00
Nedelosk bde92c4afc Add camouflage system, add greenhouse door and clean up 2016-03-13 21:00:45 +01:00
mezz 70c5e851c2 Clean up liquids and liquid containers. Use Forge's universal bucket 2016-03-06 14:53:19 -08:00
mezz ff076090e3 Move plugins to their respective folders 2016-03-04 00:44:50 -08:00
mezz 626d0d8fb5 Use the generic types now available in 1.8+. remove warning suppressions 2016-03-04 00:36:47 -08:00
mezz 2ddad6ec37 Hide some items from JEI 2016-03-04 00:08:40 -08:00
mezz 86e3ae87fd Save the owner NBT without gameprofile properties 2016-03-03 22:01:33 -08:00
mezz efcab41e04 Revert "Use generics for Chromosome type, begin unifying code"
This reverts commit 43e41034f6.

Conflicts:
	src/main/java/forestry/api/arboriculture/IAlleleTreeSpecies.java
	src/main/java/forestry/api/genetics/IAlleleSpeciesCustom.java
	src/main/java/forestry/core/proxy/ProxyRenderClient.java
2016-03-03 20:50:38 -08:00
mezz 43e41034f6 Use generics for Chromosome type, begin unifying code 2016-02-27 00:14:22 -08:00
mezz a8270ef365 Remove lots of legacy handling code 2016-02-26 21:49:04 -08:00
Nedelosk 75bbf7e6a7 Improve Model Baker and Clean Up 2016-02-26 18:08:25 +01:00
mezz 7b0259a343 Cleanup Log, loading from nbt, remove Version check 2016-02-25 19:18:50 -08:00
mezz 14c42afd29 Automatic code reformatting. Makes everything formatted the same way 2016-02-25 19:18:50 -08:00
mezz 406392e7f7 Begin code cleanup for generics, types, warnings, nulls, and spelling 2016-02-25 19:11:29 -08:00
Nedelosk c9b2f7bd3e Model System Clean Up 2016-02-25 21:44:36 +01:00
Nedelosk 28502d23e0 Fix Crate Models and other Models 2016-02-24 21:57:20 +01:00
mezz ab0d1cf7fc Split block type from properties, combine definition and properties 2016-02-22 23:39:10 -08:00
Nedelosk 96170b5f21 Fix Crate Models 2016-02-21 18:56:06 +01:00
mezz 73812d8765 Merge branch 'dev' into mc-1.8.9
# Conflicts:
#	gradle.properties
#	src/main/java/forestry/arboriculture/render/IconProviderWood.java
#	src/main/java/forestry/core/access/AccessHandler.java
#	src/main/java/forestry/core/multiblock/MultiblockTileEntityForestry.java
#	src/main/java/forestry/farming/logic/FarmLogicOrchard.java
#	src/main/java/forestry/plugins/compat/PluginGrowthCraft.java
#	src/main/java/forestry/plugins/compat/PluginHarvestCraft.java
#	src/main/java/forestry/plugins/compat/PluginPlantMegaPack.java
#	src/main/java/forestry/plugins/compat/PluginWitchery.java
2016-02-19 19:14:59 -08:00
Nirek-K 0ed33cf9a3 Increase wax cast durability to 16, Fabricator tank to 8, Add 4 to 4 Plain glass Fabrication recipe, change stamp defs to be oreDictionary. 2016-02-19 12:41:35 -06:00
Nedelosk 5a3850c264 First 1.8.9 Version 2016-01-22 19:33:35 +01: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 eff9dfcca7 Fix #978 missing localization keys for mail trades and escritoire 2015-11-21 11:06:12 -08:00
mezz a49eb1c5f9 Fix #524 Add config for Received letters HUD Placement 2015-11-20 15:31:21 -08:00
mezz 7e3b7acdef Allow hotkeys to send items to hotbar, except locked slots 2015-11-20 12:05:10 -08:00
mezz 3c7856f264 Add checking to make sure client and server can't open different GUIs 2015-11-20 09:49:55 -08:00
mezz 408a66bb40 Refactor GUI handling code 2015-11-19 20:37:33 -08:00
mezz ce2a2ec8ed Move engine blocks to PluginEnergy.blocks 2015-11-19 01:04:38 -08:00
mezz 10e5391f48 Move factory blocks to PluginFactory.blocks 2015-11-19 01:04:38 -08:00
mezz ffe19807db Move mail blocks to PluginMail.blocks 2015-11-19 01:04:37 -08:00