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
Player
72c021d99d
Work around LaunchClassLoader tripping over missing IC2 classes.
2014-08-14 15:50:13 +02:00
Parker Young
487e9fb6a6
Merge pull request #93 from mezz/missingAssets
...
Added assets for known missing textures
2014-08-13 16:08:00 -04:00
SandGrainOne
5e5d788905
Updated submodule ForestryAPI
2014-08-13 22:07:35 +02:00
SandGrainOne
07b98ad150
Fixes to trade system
2014-08-13 00:32:23 +02:00
SandGrainOne
74b51cc300
Merge branch 'mezz-mailSystemFixes'
2014-08-12 23:58:31 +02:00
SandGrainOne
ac6b684ca0
Merge branch 'mailSystemFixes' of git://github.com/mezz/ForestryMC into mezz-mailSystemFixes
2014-08-12 23:57:25 +02:00
SandGrainOne
cd132b55c7
Updating submodule references
2014-08-12 23:23:58 +02: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
CovertJaguar
54146d29b9
Removed redundant function from backpack API. All checks for item validity now use IBackpackDefinition.isItemValid() resulting in more consistent behaivor.
2014-08-12 03:47:28 -07:00
Parker
38ed2fec51
Merge branch 'master' of https://github.com/ForestryMC/ForestryMC
2014-08-12 00:46:34 -04:00
Parker
ec882b1372
Updated localizations
2014-08-12 00:46:10 -04:00
JamesMitchell
809a35025b
Added assets for known missing textures: royaljelly crate and IC2 silver crate
2014-08-11 18:37:48 -07:00
Parker Young
0a0f8a4047
Merge pull request #90 from JamesMitchell/readme
...
removed forum link from readme
2014-08-11 18:03:45 -04:00
fabricator77
d788123065
Remove dead method from hive world gen.
...
BlockBeehives doesn't have an onBlockPlaced method, and the vanilla method does nothing.
Perhaps junk left over from 1.7 update.
2014-08-12 07:27:57 +09:30
JamesMitchell
ec05cdc2c1
fixes for mail system.
2014-08-11 14:35:12 -07:00
Parker
8bcf3568fe
Updated submodules
2014-08-11 17:17:22 -04:00
Parker Young
8b39e12cdc
Merge pull request #91 from Parker8283/reformation
...
Reformed Forestry!
2014-08-11 17:07:58 -04:00
Parker
52601f02f4
Fixing merge stuffz
2014-08-11 17:03:51 -04:00
Parker
8f2d802f11
Reformed Forestry!
...
* Updated for BC 6.0.x compatibility
* Re-implemented the Pipes plugin
* Converted to vanilla assets lang system
* Converted to standard gradle file structure
* General warnings cleanup
2014-08-11 16:56:09 -04:00
JamesMitchell
9db400bb20
removed forum link from readme
2014-08-11 12:13:12 -07:00
SandGrainOne
0775164174
Disable hotbar keys for GuiLetter
...
Fixes #36
2014-08-11 20:16:38 +02:00
SandGrainOne
ce35722e1b
GameProfile fixes for Letter
...
Fixes #61 , also fixes #45
2014-08-10 15:23:08 +02:00
SirSengir
36248c02f1
Merge pull request #83 from bspkrs/patch-1
...
Avoid NPE for fringe cases
2014-08-07 20:03:09 +02:00
bspkrs
29a24d9632
Avoid NPE for fringe cases
...
This change avoids an NPE that can occur in the rare case when thePlayer is not null, but theWorld is.
2014-08-07 12:05:28 -04:00
SirSengir
9e6daeb668
Merge pull request #82 from Vexatos/master
...
Updated lang submodule
2014-08-07 13:14:19 +02:00
Vexatos
68262a896e
Updated lang submodule
2014-08-07 13:05:59 +02:00
SirSengir
cf356a08c8
Merge pull request #80 from jvantuyl/master
...
fix license links
2014-08-07 12:11:40 +02:00
Jayson Vantuyl
23c44af66b
fix license links
...
In the boilerplate for various files, the link to the license goes to the GPL,
not LGPL. This is likely remaining from the other stuff cleaned up in commit
027c9de , which fixed a similar mismatch.
2014-08-07 02:57:32 -07:00
SirSengir
027c9dead0
Fix copy/pasta derp in License.txt and link to license text.
2014-08-07 11:02:46 +02:00
CovertJaguar
16ec5871b8
Merge pull request #79 from JamesMitchell/fixes
...
Fix Naturalist Backpack dupe & delete bugs
2014-08-07 00:42:49 -07:00
JamesMitchell
0c949593a7
Fix Naturalist Backpack dupe/delete bug
2014-08-07 00:12:57 -07:00
SirSengir
43f1570732
Relicense to LGPL v3.
2014-08-07 08:29:25 +02:00
SirSengir
fb6233b1ea
Revert "Revert "Register oxeye daisy as well""
...
This reverts commit 0df2c24766 .
2014-08-07 07:20:12 +02:00
Binnie
6ef6bb05ed
Merge pull request #78 from ForestryMC/revert-76-daisy_fix
...
Revert "Register oxeye daisy as well"
2014-08-06 20:13:24 +01:00
Binnie
0df2c24766
Revert "Register oxeye daisy as well"
2014-08-06 20:05:26 +01:00
Binnie
350b9b08cf
Merge pull request #76 from Yoplitein/daisy_fix
...
Register oxeye daisy as well
2014-08-06 19:28:27 +01:00
Alex Binnie
5a349749cf
Added Acacia and Dark Oak to arboriculture. Fixes #48
2014-08-06 14:31:28 +01:00
Alex Binnie
661f074bb1
Fixed /givequeen so it has a mate. Fixes #24
2014-08-06 13:50:39 +01:00
Alex Binnie
b64ed2dc63
Added check to prevent leaves from being pollinated with non-tree pollen
2014-08-06 13:39:29 +01:00
Steven Dwy
79fa903007
Register oxeye daisy as well
2014-08-04 16:59:56 -07:00
SandGrainOne
3cbbb22b52
Better message when there are invalid alleles
...
Added detection of chromosomes with invalid alleles. Cause Exception
with more explicit message.
2014-08-04 23:42:59 +02:00
SandGrainOne
1ec85b4e79
Fixes related to OwnerLedger and GameProfile
...
Change the name of method getOwnerName to getOwnerProfile and improved
robustness for when owner (GameProfile) is missing. Fixes #66
2014-08-03 20:32:56 +02:00
SirSengir
420c5497e9
Merge pull request #73 from jodamm/master
...
fix for not spawning offsprings after saved to NBT
2014-08-03 14:26:31 +02:00
jodamm
ca16754695
fix for not spawning offsprings after saved to NBT
2014-08-03 05:50:07 +02:00
SirSengir
c66da17e18
Merge pull request #69 from jodamm/master
...
Fix for not spawning offsprings when inventory is full and chunk is unloaded.
2014-07-28 21:04:42 +02:00
jodamm
818f221d68
Update BeekeepingLogic.java
...
fix for not spawnig offsprings when inventory is full and chunk is unloaded.
2014-07-28 03:08:29 +02:00
Player
5d0d0d7163
Fix some warnings, update Forge
2014-07-12 07:55:59 +02:00
Player
8e5d78d8cf
1.7.10 port - compiles, but likely still broken ingame
2014-07-12 06:43:59 +02:00
SandGrainOne
fdf94f7a39
Duping begone!
...
Fixes #26
2014-07-10 21:12:19 +02:00