Commit graph

2120 commits

Author SHA1 Message Date
SpaceToad
a69d4a3df6 Merge pull request #1461 from Cisien/patch-4
Set the block name for lasers
2014-02-21 07:42:47 +01:00
SpaceToad
8ef76cb42d Merge pull request #1459 from Cisien/patch-2
SideOnly on client only methods in gates
2014-02-21 07:41:19 +01:00
Chris
e0f968eeb9 Set the block name for lasers 2014-02-20 21:45:36 -08:00
Chris
9aed7e7cba Corrects srcDir property
Please validate this change doesn't impact other workspaces. I validated 'gradle build' and 'gradle idea'

In the IDEA workspace, the "Source Root" directory was incorrectly directed to common/buildcraft. This had to be changed to common in the IDEA workspace.
2014-02-20 20:58:53 -08:00
Chris
8d1a56f02e SideOnly on client only methods in gates
Problem: When loading a world that has gates, the server will crash with this exception:
http://paste.cisien.com/f/33730518.txt

Solution: add @SideOnly(Side.CLIENT) to the methods that deal with IIcon, since they are client-side only.

Tested item pipes with gates pulling items from a chest in single player, and in multi-player
2014-02-20 20:38:28 -08:00
SpaceToad
aa65b484ac fixed villages generation, fix #1458 2014-02-20 08:47:24 +01:00
SpaceToad
30b00a3a2a 5.0.2 release 2014-02-19 08:37:12 +01:00
SpaceToad
b517ce2bf6 fixed (again) item facades, fix #1454 2014-02-19 08:27:53 +01:00
SpaceToad
873c39f314 added back some proxy code, fixing server load, fix #1447 2014-02-18 20:42:57 +01:00
SpaceToad
f6240d4285 Merge branch 'BuildCraft-5.0.x' of github.com:BuildCraft/BuildCraft into BuildCraft-5.0.x 2014-02-18 08:34:50 +01:00
SpaceToad
f8311fd5d1 fixed build number 2014-02-18 08:34:24 +01:00
SpaceToad
922a82b639 Merge pull request #1453 from Cisien/patch-1
Squishing some left over ants...
2014-02-18 08:25:30 +01:00
Chris
cca86dd041 Squishing some left over ants... 2014-02-17 16:26:29 -08:00
AbrarSyed
a665980842 fixed buildnumber mistake, accounted for change in localization repo 2014-02-17 16:53:43 -06:00
SpaceToad
983cd6fba7 version 5.0.1 2014-02-17 22:14:03 +01:00
SpaceToad
31f6516b79 Merge branch 'patch-2' of https://github.com/viliml/BuildCraft into viliml-patch-2 2014-02-17 21:32:49 +01:00
SpaceToad
a210de6f1b Merge remote-tracking branch 'origin/BuildCraft-5.0.x' into BuildCraft-5.0.x 2014-02-17 21:29:07 +01:00
CovertJaguar
6878a2c375 Merge pull request #1449 from robin4002/BuildCraft-5.0.x
fix format and use splitToList
2014-02-17 12:10:26 -08:00
SpaceToad
9850ed11e0 Merge branch 'BuildCraft-5.0.x' of https://github.com/Ubiquitous-Spice/BuildCraft into BuildCraft-5.0.x 2014-02-17 21:01:59 +01:00
AbrarSyed
918d840494 updated README for gradle 2014-02-17 10:30:08 -06:00
viliml
5facf915ba Fix Facade names
This is how to control name of items.
2014-02-17 16:27:11 +01:00
Robin
7a48cd63f3 fix format and use splitToList 2014-02-17 13:31:48 +01:00
AbrarSyed
507eb014af Step 2: The Rebirth 2014-02-17 01:24:19 -06:00
SpaceToad
be5b87eb12 attempt at making facade computation more robust, fix #1444 2014-02-16 22:33:42 +01:00
AbrarSyed
22b0baed33 Step 1: The Purge 2014-02-16 14:08:51 -06:00
SpaceToad
98d02ac976 added gradle-based build script 2014-02-16 10:33:13 +01:00
SpaceToad
ce393ec0ef fixed conversion error, fix #1439 2014-02-16 09:37:00 +01:00
SpaceToad
f5f192e7df removed all references to EntityClientPlayerMP and fixed filler packet, fix #1437 2014-02-16 09:29:26 +01:00
SpaceToad
5be1c3d066 changed biome ids in config, fix #1438 2014-02-16 09:19:11 +01:00
SpaceToad
a20f40b67f removed file added by mistake 2014-02-16 08:58:51 +01:00
SpaceToad
1f75b09bba Merge remote-tracking branch 'origin/BuildCraft-5.0.x' into BuildCraft-5.0.x 2014-02-16 08:57:22 +01:00
robin4002
754857dbb6 Move to assets lang system 2014-02-16 00:48:23 +01:00
SpaceToad
a91079540f Update README.md
Added additional instruction on issues opened on the tracker.
2014-02-15 23:07:49 +01:00
SpaceToad
42c98f757a Merge branch 'marmot' into BuildCraft-5.0.x 2014-02-15 17:32:37 +01:00
SpaceToad
ce432eaa76 further fixes in facades 2014-02-15 14:45:22 +01:00
SpaceToad
6b21bdd901 more fixes following last pull 2014-02-15 14:16:23 +01:00
SpaceToad
8a30d95286 Merge pull request #1433 from fabricator77/BuildCraft-5.0.x
Fix IIcon sided crashes on dedicated server
2014-02-15 14:06:26 +01:00
SpaceToad
88bb117094 added more gate options in creative 2014-02-15 09:57:27 +01:00
SpaceToad
360d782ea9 normalized file headers 2014-02-15 09:21:40 +01:00
fabricator77
d2a4dabdc7 Fix IIcon sided crashes on dedicated server 2014-02-15 14:09:48 +10:30
SpaceToad
b3dac23866 fixed generic fluid pumping 2014-02-14 08:53:53 +01:00
SpaceToad
ebbc8d2146 resurected minimum amount of blueprint for quarry frame 2014-02-11 22:46:50 +01:00
SpaceToad
3580d4b34a fixed quarry placement and various minors twearks 2014-02-11 21:11:06 +01:00
SpaceToad
12ec799ea3 fixed calls to sendNetworkUpdate 2014-02-11 08:23:55 +01:00
SpaceToad
9742bd6911 fixed location of icons/triggers to get proper icon load 2014-02-10 21:49:48 +01:00
SpaceToad
ef400b1d92 fixed missing packet ids transmission 2014-02-10 18:24:27 +01:00
SpaceToad
8f7f8d31ad fixed player in net handler and deprecated proxies 2014-02-10 18:06:44 +01:00
SpaceToad
f227dc2afc fixed items traveling in pipes 2014-02-10 16:05:05 +01:00
SpaceToad
f10e728b59 fixed pipe state synchronization 2014-02-10 15:16:32 +01:00
SpaceToad
944b9d693b fixed get description packets 2014-02-10 13:04:20 +01:00