Commit graph

4144 commits

Author SHA1 Message Date
SirSengir
38fe0d4081 Merge branch 'buildcraft131' of github.com:SirSengir/BuildCraft into buildcraft131 2012-08-25 11:49:38 +02:00
Krapht
b649839ba9 Fix facades 2012-08-25 11:48:25 +02:00
SirSengir
784dde1403 Merge pull request #182 from CovertJaguar/patch-5
Cast left over from old code.
2012-08-25 01:14:07 -07:00
SirSengir
d449eea029 Removed unneeded imports. 2012-08-25 10:00:42 +02:00
SirSengir
59c0b8511d Merge remote-tracking branch 'remotes/origin/cpwfixes' into buildcraft131 2012-08-25 09:55:20 +02:00
CovertJaguar
b0c68772e2 Pretty sure this cast shouldn't be here. 2012-08-24 20:19:04 -07:00
SirSengir
e493ce7ba1 Merge pull request #180 from Xhamolk/patch-1
Update common/buildcraft/transport/pipes/PipeItemsWood.java
2012-08-24 18:02:43 -07:00
Xhamolk
5597599e31 Update common/buildcraft/transport/pipes/PipeItemsWood.java
I believe setPowerProvider(IPowerProvider) was backwards, as it didn't allow the powerProvider field to be modified.
2012-08-24 16:35:54 -06:00
Christian
a2d9670fdc Remove mod_ files, clean up client server separation a bit 2012-08-24 13:25:54 -04:00
Christian
dae6a2d344 No more modloader references please! 2012-08-24 09:20:43 -04:00
SirSengir
6770392784 Made quarry not crash instantly. Still a horrible, horrible mess. 2012-08-24 14:13:45 +02:00
SirSengir
1a5ad78290 Hooked up some entity rendering. 2012-08-24 13:56:33 +02:00
SirSengir
15c1ce54e0 Removed ISpawnHandler references. 2012-08-24 13:41:16 +02:00
aritzhack
c984c5db46 Addded the missing accents 2012-08-23 17:59:00 +02:00
Krapht
7d3889d8df Re-enable syncing of diamond pipe filter contents 2012-08-23 07:55:08 +02:00
Krapht
dbb04486c3 Integrate serverside transport packethandler into common and wipe server folder 2012-08-22 22:45:27 +02:00
Krapht
58b3ad5f24 Clean up legacy packet ids 2012-08-22 22:09:12 +02:00
Krapht
bedc265c66 Added gatekind to corestate + some cleanup 2012-08-22 21:43:55 +02:00
aritzhack
0e137d86d0 Added es_ES (Spanish-Spain) languaje file 2012-08-22 11:09:04 +02:00
SirSengir
e9469ef933 Split up some rendering code, moved init to proxy. 2012-08-21 16:07:56 +02:00
SirSengir
b29be13156 Re-enabled rendering of oil. 2012-08-21 15:53:38 +02:00
SirSengir
d1275161af Hooked up oil world generation again. 2012-08-21 15:49:18 +02:00
Krapht
6622b69a16 Update README.md
Updated readme with contribution information
2012-08-20 15:08:17 +03:00
Krapht
aaa54ac79c Make buildcraft tiles send update packets again 2012-08-20 13:50:18 +02:00
Krapht
9f0ebac842 Fixed Tiles sending old-school BC description packets 2012-08-20 13:41:11 +02:00
SirSengir
f2c08828f9 Merge remote-tracking branch 'remotes/origin/master' into buildcraft131 2012-08-19 12:09:52 +02:00
SirSengir
8dc7fa9fad Merge pull request #173 from SandroHc/abe457d40145c12a95f253fe920941203a295162
Added pt_PT (Portuguese - Portugal) translation
2012-08-19 03:02:25 -07:00
SirSengir
1b13d6cf20 Reimplemented inventory rendering. 2012-08-19 11:11:24 +02:00
SirSengir
871b9edbf5 Added some stuff to creative inventory. 2012-08-19 10:50:53 +02:00
Sandro Amaral
3a192c5d2a Added Facade to pt_PT translation 2012-08-19 03:42:15 +01:00
Sandro Amaral
abe457d401 Added pt_PT (Portuguese -Portugal) translation 2012-08-19 03:37:58 +01:00
SirSengir
f12688e0a3 Changed path of configuration file. 2012-08-18 12:06:35 +02:00
SirSengir
b87d8fd817 Eliminated isClient(). 2012-08-18 11:57:24 +02:00
SirSengir
c724e960f1 Cleaned up unneeded imports. 2012-08-18 11:46:48 +02:00
SirSengir
316e2a5019 Fixed a startup crash. 2012-08-18 11:29:57 +02:00
SirSengir
c3579a70c6 Fixed a typo. 2012-08-18 11:21:58 +02:00
SirSengir
69958df8b7 Merged proxies. 2012-08-18 11:18:57 +02:00
SirSengir
b29f03e832 Merge pull request #170 from mcrobin4002/patch-1
Update buildcraft_resources/lang/buildcraft/fr_FR.properties
2012-08-17 23:39:55 -07:00
SirSengir
146682c092 Renamed "Crafting*" to "Container*". 2012-08-17 19:38:08 +02:00
SirSengir
06ea69bfea Merged packet handlers except transport. 2012-08-17 19:31:30 +02:00
SirSengir
e04336fe5f Merged gui handlers. 2012-08-17 19:22:40 +02:00
SirSengir
2a90fffef1 Decimated server side. Removed root classes. 2012-08-17 19:14:53 +02:00
SirSengir
7ee5690011 Removed server side mod classes. 2012-08-17 19:06:41 +02:00
SirSengir
a27df19fdb Reorganized gui and render classes into own subpackages. (Client and Common) 2012-08-17 19:03:06 +02:00
SirSengir
d19cf6ac83 More cleanup. Redid some event handling. 2012-08-17 18:48:06 +02:00
mcrobin4002
a77d9eca37 Update buildcraft_resources/lang/buildcraft/fr_FR.properties
fixe sandstone pipe
2012-08-17 15:05:05 +03:00
SirSengir
f3ab468420 Merge pull request #169 from phpr/master
french language file and translation by robin4002 and zzt
2012-08-15 10:00:41 -07:00
Krapht
5ad6bd1d57 Merge branch 'buildcraft131' of github.com:SirSengir/BuildCraft into buildcraft131 2012-08-14 23:18:31 +02:00
Krapht
fc1d0fee95 Fixed GUI handler for transport, fixed gates showing up in creative inventory, moved pipeid in TEGenPipe to corestate 2012-08-14 23:18:03 +02:00
SirSengir
70bd836c0a Merge pull request #167 from AartBluestoke/patch-2
OilBucketHandler should @ForgeSubscribe to its event.
2012-08-14 11:31:47 -07:00