upstream/ForestryMC
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/ForestryMC.git synced 2026-10-25 20:22:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,671 Commits 3 Branches 277 Tags
master
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
CovertJaguar 0a68dc0307 Issue #431 Work around no longer required, fix merged into Forge 1.7.10-10.13.2.1283 and 1.8-11.14.0.1282 2015-01-09 13:15:31 -08:00
CovertJaguar b41646540c Issue #431 Restore mezz's original fix, with a TODO comment 2015-01-07 16:01:12 -08:00
CovertJaguar 8dc81b53d6 Improves #431 Calling markBlockForUpdate() on the server is unneccesary, plus other optimizations. 2015-01-07 13:46:30 -08:00
CovertJaguar eefd71ef56 Grab and insert the Buildcraft License file into the jar 2014-12-25 09:26:04 -08:00
CovertJaguar 0fcd151776 Update build.gradle with the submodule changes....clean up api inclusion code (hacks on top of hacks! one hack adds APIs to the jar while another is removing it lol) 2014-12-24 08:07:51 -08:00
CovertJaguar 52994b2a39 Fix Lang submodule default url to use the github protocol. 2014-12-24 08:05:17 -08:00
CovertJaguar 885fc1291e Remove RF API sources from repo 2014-12-24 07:34:16 -08:00
CovertJaguar b23167d468 Readd Forestry API correctly this time. 2014-12-24 07:31:59 -08:00
CovertJaguar 6d7f30ea6b Remove Forestry API again because I derped it up 2014-12-24 07:30:42 -08:00
CovertJaguar 70d8d76934 Readd APIs as submodules 2014-12-24 07:28:20 -08:00
CovertJaguar a449e1b3b2 Remove API from the ignored folders 2014-12-24 07:26:14 -08:00
CovertJaguar ca64f88113 Remove Forestry API in prep for adding RF API as a submodule (changing the directory tree) 2014-12-24 07:21:11 -08:00
CovertJaguar 62261a5b8f TankManager.tankCanDrainFluid() should take the fluid type into account (oops) 2014-12-24 07:10:06 -08:00
CovertJaguar db0ab5feda Fixes #379 Clean up and fix Naturalist Chest 2014-12-18 06:02:38 -08:00
CovertJaguar 06549d1e2d Fix usage usability checks to account for access setting. 2014-12-18 06:01:42 -08:00
CovertJaguar 8406073107 Fixes #378 Alveary should ensure it has a an inventory before it tries to read item into it. 2014-12-18 01:53:55 -08:00
CovertJaguar 4e963ca6e1 Improve ErrorStateRegistry 2014-12-17 00:28:21 -08:00
CovertJaguar 947717873d Fix faulty pipe selection randomizer in moveOneItemToPipe() 2014-12-16 23:44:39 -08:00
CovertJaguar 89c3fb8bdf Attempt to fix issues with structure inventories. 
Also cleaned up the Hatch pipe/inventory interaction code, modernizing it and removing duplicate code.
This involved adding my AdjecentInventoryCache and AdjecentTileCache code from Railcraft for greatly improved performance.
ISpecialInventory is now 100% unused.
 2014-12-16 03:09:15 -08:00
CovertJaguar c7d88d73d3 Clean imports 2014-12-15 08:15:21 -08:00
CovertJaguar 344bb7514b Finish Inventory cleanup 2014-12-15 08:09:46 -08:00
CovertJaguar db93c6e930 Merge branch 'dev' into inventory-cleanup 
Conflicts:
	src/main/java/forestry/apiculture/gadgets/TileAlvearyHygroregulator.java
	src/main/java/forestry/core/circuits/ItemSolderingIron.java
	src/main/java/forestry/core/gadgets/TileAnalyzer.java
	src/main/java/forestry/energy/gadgets/EngineBronze.java
	src/main/java/forestry/energy/gadgets/MachineGenerator.java
	src/main/java/forestry/factory/gadgets/MachineBottler.java
	src/main/java/forestry/factory/gadgets/MachineCarpenter.java
	src/main/java/forestry/factory/gadgets/MachineFabricator.java
	src/main/java/forestry/factory/gadgets/MachineMoistener.java
	src/main/java/forestry/factory/gadgets/MachineRaintank.java
	src/main/java/forestry/factory/gadgets/MachineSqueezer.java
	src/main/java/forestry/factory/gadgets/MachineStill.java
	src/main/java/forestry/mail/gadgets/MachineTrader.java
 2014-12-15 07:56:29 -08:00
CovertJaguar aaa00d0184 For whatever reason the Potion.isBadEffect() reflection was giving me generics related compile errors. This fixes it. 2014-12-15 07:46:28 -08:00
CovertJaguar d4b8c6b503 Bump version 2014-12-15 07:45:25 -08:00
CovertJaguar ccdcce47cc Fixes #369 The Solding Iron and other Cicruit stuff should no longer crash if no layouts are defined. 
The fix kind of grew out of control because I had to add a new EnumErrorCode and didn't want to keep breaking the API every time I did that. So I needed to decouple the ErrorStates from EnumErrorCode.
 2014-12-15 07:45:10 -08:00
CovertJaguar 792ab77a48 More Inventory rewrite stuff. 2014-12-13 18:20:52 -08:00
CovertJaguar 3326f4db03 Merge branch 'dev' of github.com:ForestryMC/ForestryMC into inventory-cleanup 
Conflicts:
	src/main/java/forestry/apiculture/gadgets/TileAlvearyHygroregulator.java
	src/main/java/forestry/apiculture/gadgets/TileAlvearySwarmer.java
	src/main/java/forestry/core/gui/ContainerForestry.java
	src/main/java/forestry/energy/gadgets/EngineBronze.java
	src/main/java/forestry/energy/gadgets/MachineGenerator.java
	src/main/java/forestry/factory/gadgets/MachineBottler.java
	src/main/java/forestry/factory/gadgets/MachineCarpenter.java
	src/main/java/forestry/factory/gadgets/MachineFabricator.java
	src/main/java/forestry/factory/gadgets/MachineFermenter.java
	src/main/java/forestry/factory/gadgets/MachineMoistener.java
	src/main/java/forestry/factory/gadgets/MachineRaintank.java
	src/main/java/forestry/factory/gadgets/MachineStill.java
	src/main/java/forestry/factory/gadgets/TileWorktable.java
	src/main/java/forestry/farming/gadgets/TileFarmPlain.java
	src/main/java/forestry/farming/gui/ContainerFarm.java
 2014-12-13 16:39:40 -08:00
CovertJaguar 4f48cd5890 More progress on inventory rework 2014-12-05 12:43:23 -08:00
CovertJaguar 48d6230ed1 Update lang 2014-12-05 12:43:00 -08:00
CovertJaguar f3895aeaab Merge branch 'dev' into inventory-cleanup 2014-12-04 19:09:37 -08:00
CovertJaguar 3636af5b9c More work on inventory stuff, and fix all the broken merge stuff 2014-11-30 17:59:31 -08:00
CovertJaguar 034cdf2860 Intial stages of an cleanup of the inventory code, this commit is very broken. 2014-11-30 17:19:16 -08:00
CovertJaguar 3d765067cf Merge branch 'dev' of github.com:ForestryMC/ForestryMC into dev 
Conflicts:
	src/main/java/forestry/core/utils/BlockUtil.java
 2014-11-30 16:50:09 -08:00
CovertJaguar 6ea4ab4491 Clean up Engines a bit. 
Remove ISpecialInventory implementations on Engines.
Change Engines to IEnergyConnection instead of IEnergyHandler.
 2014-11-28 10:36:13 -08:00
CovertJaguar 10a5ba3eb8 Update lang 2014-11-28 10:34:52 -08:00
CovertJaguar 8ce7e49d5f Update dependencies 2014-11-28 10:03:11 -08:00
CovertJaguar bb5f2b0977 Remove some crashy debug statements from AIButterflyPollinate 2014-11-17 19:12:07 -08:00
CovertJaguar feef3b8a63 Merge branch 'dev' of github.com:ForestryMC/ForestryMC into dev 2014-11-16 20:06:05 -08:00
CovertJaguar 6e33a55bcb TIL that fake players now implement EntityPlayerMP 2014-11-16 20:05:47 -08:00
CovertJaguar 968ad8189e Update lang 2014-11-15 04:08:33 -08:00
CovertJaguar aba03f6364 Merge pull request #330 from ForestryMC/beekeepingCommands 
update beekeeping commands
 2014-11-15 00:39:49 -08:00
CovertJaguar 8fe22130d3 Use ChastStyle instead of formatting codes 2014-11-13 04:33:41 -08:00
CovertJaguar 79c7ae435c Convert Mail Commands. 
And various other improvements to the command code and localization support.
 2014-11-13 04:25:10 -08:00
CovertJaguar 6a3d92e825 Add license header file, for IDE use. 2014-11-13 02:36:38 -08:00
CovertJaguar c2acb36c44 I really need to tell my IDE to use Forestry's file header for this project, not Railcraft's.... 2014-11-13 02:22:40 -08:00
CovertJaguar 4609ebc754 Major Butterfly AI rework, they should be less derpy about getting stuck in holes and flying over oceans. 
Various other tweaks and improvements as well, including a fix for the spazzy wing movement that 1.7 introduced.
 2014-11-13 02:14:17 -08:00
CovertJaguar aea3c55192 Update Buildcraft to 6.1.7 2014-11-13 02:11:03 -08:00
CovertJaguar e7ae15c81d Merge branch 'dev' of github.com:ForestryMC/ForestryMC into dev 2014-11-12 03:53:40 -08:00
CovertJaguar 4a390fe967 Creates a new command framework that supports trees of commands simply and easily. 
Depreciated CommandMC. Many commands remain to be converted to the new system.
Added a butterfly kill command.
 2014-11-12 03:53:01 -08:00
CovertJaguar 2132c4457d Apply formatting to Butterfly classes 2014-11-12 03:24:07 -08:00
CovertJaguar 4fcb9cb221 Update README.md 2014-10-08 18:22:09 -07:00
CovertJaguar 1e4db46584 Update README.md 2014-10-08 18:21:42 -07:00
CovertJaguar 5a9d2fd14d Update Lang submodule 2014-10-08 15:54:32 -07:00
CovertJaguar 547719b6df Bump version 2014-10-08 15:46:53 -07:00
CovertJaguar eb102ac7d7 Bump version 2014-10-08 15:46:13 -07:00
CovertJaguar 12011b6bb1 Add some sanity checks to the Sapling1 pickBlock() function. 
Closes #276
 2014-10-08 15:29:10 -07:00
CovertJaguar 7fbdb8b670 Update lang 2014-10-08 08:31:23 -07:00
CovertJaguar ef3a62a9e7 Add some sanity checks to the Sapling1 pickBlock() function. 
Closes #276
 2014-10-08 08:18:46 -07:00
CovertJaguar 7ae094ab72 There is a function for that. 2014-10-06 15:14:14 -07:00
CovertJaguar 9a1888e85c Update application.properties 2014-10-06 08:47:42 -07:00
CovertJaguar 8a452bd154 Add a build qualifer to the version string 2014-09-30 18:43:23 -07:00
CovertJaguar 270147ce36 Add a build qualifer to the version string 2014-09-30 18:42:33 -07:00
CovertJaguar 6c0dc4a5d9 Merge pull request #249 from MineMaarten/patch-1 
Update CircuitFarmLogic.java
 2014-09-28 08:50:51 -07:00
CovertJaguar 343d23b104 Merge branch 'release_3.1' of github.com:ForestryMC/ForestryMC into release_3.1 2014-09-27 17:01:46 -07:00
CovertJaguar c1b29f5c20 Make Analyzer Machine require power and accept Honey Drops 2014-09-26 23:17:07 -07:00
CovertJaguar a6708ac4ab Merge branch 'dev' into release_3.1 2014-09-26 13:55:49 -07:00
CovertJaguar 23b1df18d4 Bump version 2014-09-26 00:44:43 -07:00
CovertJaguar 979516f069 Farms radius is now (width of central structure * 3) instead of (width + 1) 2014-09-23 20:25:05 -07:00
CovertJaguar 6f69f9830e Merge branch 'master' into redstoneflux 2014-09-23 19:46:10 -07:00
CovertJaguar fbaad8bf93 Some tree farm optimizations. 2014-09-23 19:41:24 -07:00
CovertJaguar 63979170ad Merge branch 'master' into redstoneflux 2014-09-23 18:03:15 -07:00
CovertJaguar 23ae1abb06 Vanilla species shouldn't be secret 2014-09-22 20:30:53 -07:00
CovertJaguar cc5f102d1c Some plugin manager error checking and tweaks. 2014-09-22 20:30:25 -07:00
CovertJaguar 27d8f9f585 Update submodules 2014-09-22 06:26:28 -07:00
CovertJaguar 7cc3668a70 General clean up and improvement of internal plugin system 2014-09-20 22:43:13 -07:00
CovertJaguar 3ad5bdd598 Update submodules 2014-09-20 18:39:45 -07:00
CovertJaguar b9da1201e9 Merge branch 'master' into plugins-rcstyle 2014-09-20 18:34:04 -07:00
CovertJaguar c03a761c16 Clean up imports on plugin loader 2014-09-20 18:33:24 -07:00
CovertJaguar 8278f4688a Merge branch 'master' into plugins-rcstyle 
Conflicts:
	api
	lang
 2014-09-20 18:26:01 -07:00
CovertJaguar 133ad7d606 Merge pull request #204 from ShetiPhian/patch-1 
Set toolClass of ItemWrench to "wrench"
 2014-09-20 18:12:55 -07:00
CovertJaguar 40e6301eca Merge pull request #197 from ForestryMC/nei_tabs 
Info tabs push NEI out of the way
 2014-09-19 03:48:35 -07:00
CovertJaguar 5442b99837 Replace ForestryTank with StandardTank 2014-09-16 17:40:39 -07:00
CovertJaguar 7947a66187 Missed one. 2014-09-16 17:15:29 -07:00
CovertJaguar 2f7ed2386c Port Railcraft's Fluid utilities to Forestry. 2014-09-16 17:14:00 -07:00
CovertJaguar dfb4658fd0 Merge pull request #168 from EoD/fixing-item-remapping 
Fixing broken item remapping (version 2)
 2014-09-05 13:35:47 -07:00
CovertJaguar 5f53385aaa Fix broken item remappings. 2014-09-04 16:52:11 -07:00
CovertJaguar 07c0927083 Add MissingMapping handling (untested) 
Closes #133
 2014-08-25 17:19:29 -07:00
CovertJaguar cfba14ed1d Merge pull request #131 from oitsjustjose/master 
Remove rendering of other glass blocks' sides.
 2014-08-19 18:22:46 -07:00
CovertJaguar 9a6e5f858d Bump version to 3.0, its a brand new world! 2014-08-18 13:11:08 -07:00
CovertJaguar 72121b3abd Should probably fix this... 2014-08-18 08:29:34 -07:00
CovertJaguar c99eb94d6b We might be able to reduce some of the world breakage...particually of items (save the bees!) 2014-08-18 08:23:14 -07:00
CovertJaguar 15d40439b6 Minor stuff 2014-08-18 06:28:08 -07:00
CovertJaguar add3572085 Fix missing support for ForestryBlock 2014-08-18 05:38:48 -07:00
CovertJaguar 83789ae8f7 Fix item and block localization. This is a world breaking change! 2014-08-18 05:20:29 -07:00
CovertJaguar 5fcc76a2fa Move en_US to localization repo 2014-08-18 05:01:22 -07:00
CovertJaguar d2f2d61997 Merge pull request #122 from Vexatos/master-fork 
Even more localization additions.
 2014-08-18 00:45:26 -07:00
CovertJaguar 7635af7fa2 We only need to load the textures for our type of bag, not all types. 
Closes #99
 2014-08-15 17:20:00 -07:00
CovertJaguar fbe7aca865 Revert "Merge pull request #92 from fabricator77/patch-3" 
This reverts commit 3632e6bc4e, reversing
changes made to 72c021d99d.
 2014-08-15 17:05:29 -07:00
CovertJaguar 3632e6bc4e Merge pull request #92 from fabricator77/patch-3 
Remove dead method from hive world gen.
 2014-08-15 16:52:09 -07:00
CovertJaguar af081c614f Simplify some of the backpack code and "fix" the localization code so that it isn't prefixing "Woven" in a non-localization friendly way. This is only hack fix though, all the bags will lose the "Woven" prefix entirely until Forestry is converted to the vanilla localization api. 2014-08-12 05:13:09 -07:00