Flow86
ac3db7f7bd
fix loosing information on chunk save/load
2013-04-03 08:56:01 +02:00
Krapht
c9830eae3d
Merge branch 'mc1.5'
2013-04-03 07:41:32 +02:00
Flow86
09581d100b
dont use Math.round
...
merges and closes #696
2013-04-02 12:51:44 +02:00
Flow86
8881f1ff12
Update build.xml
...
change to newer forge (623 has a bug)
2013-04-02 12:32:52 +03:00
Flow86
f058b517b5
add (independent) target for copying source only (build.xml can be used for sub-mods more easily then)
...
target compile will use it then
2013-04-02 09:24:31 +02:00
Flow86
1ad6209d42
Players engine corrections to target a specific amount of energy in the engine before throttling
2013-04-02 09:17:17 +02:00
Krapht
8f40131c37
Import cleanup, added warning supressions
2013-04-01 16:21:12 +02:00
SirSengir
fa6393b95b
Added NPE check to prevent a crash when certain config options are unused.
2013-04-01 10:55:51 +02:00
Krapht
cb8602439f
Fix breaking fx for submod pipes
2013-04-01 01:31:33 +02:00
Krapht
2095731772
Clarified javadocs Closes #609
2013-03-31 19:34:05 +02:00
Krapht
8cb7ff17a0
Remove debug output
2013-03-31 19:23:08 +02:00
Krapht
8401fc600c
Make idle TileLasers more cpu friendly. Closes #617
...
*Will only search for work every 5s (up from 0.5s)
*Will bleed 0.1MJ / tick while searching, so unless it gets
additional power it will eventually fully stop searching
2013-03-31 19:18:44 +02:00
Krapht
2574acf9a0
Update forge version in build.xml. Closes #710
2013-03-31 16:43:55 +02:00
Krapht
7e0db04005
Fixed up build.config
...
Updated forge version
buildscript will now use a git describe to get a version
2013-03-30 22:49:40 +01:00
Krapht
e84f6cf790
Removed debug output
2013-03-30 22:06:11 +01:00
Christian
99bae591d5
Revert experimental pipe flow changes
2013-03-29 22:59:04 -04:00
Christian
738d5ede52
Fix oil, fuel, quarry and pump
2013-03-29 22:55:53 -04:00
Christian
4a5d5b219d
Fix filler GUI and world rendering
2013-03-29 21:45:07 -04:00
Christian
05c235da6f
Fix lasers
2013-03-29 21:24:49 -04:00
Christian
5441e821ad
Fix trigger/action rendering
2013-03-29 20:47:12 -04:00
Christian
e6633ae6ff
Fix up engineiron to use the new tank persistence methods
2013-03-29 18:17:49 -04:00
Christian
b341914b84
Fix up for liquidstack immutability
2013-03-29 15:40:27 -04:00
Christian
53a8db85e8
Fix up the rendering of gui engines. Closes #708
2013-03-29 12:43:29 -04:00
Krapht
d4a396e94a
Fixed the hit effects and delete the old fuel png
2013-03-28 23:12:36 +01:00
Krapht
c4820303c6
Fixed the fuel texture
2013-03-28 22:48:18 +01:00
Krapht
d9db8bb0f5
* Fixed the breaking texture, good work CJ =)
2013-03-28 22:22:18 +01:00
CovertJaguar
4545cf90e2
Fixed block particle effects
...
They now use the correct texture (in theory).
2013-03-28 14:06:55 -07:00
Krapht
dbc76521a2
Use the striped pipe as the breaked block texture, for now
2013-03-28 21:40:21 +01:00
Krapht
50030fd815
Merge branch 'patch-4' of git://github.com/TarzanBuzzyMan/BuildCraft into fixxy
2013-03-28 17:01:46 +01:00
Krapht
5bbf31f279
Updated to forge 616
2013-03-28 17:00:52 +01:00
Krapht
6d93b645e2
Fir merge error
2013-03-28 16:44:03 +01:00
Krapht
aecc8f0d3a
Merge branch 'IPowerReceptorChange' into mc1.5
...
Conflicts:
common/buildcraft/transport/TileGenericPipe.java
2013-03-28 16:41:17 +01:00
Christian
193558f71c
Printline die!
2013-03-28 07:47:57 -04:00
Christian
28f93b9dcc
Printline die!
2013-03-28 07:47:06 -04:00
Christian
04be016691
Merge branch 'master' into mc1.5
...
Conflicts:
common/buildcraft/transport/EnergyPulser.java
2013-03-28 07:46:50 -04:00
Christian
eb8d6cace2
Fix some minor logic derps in the energy pulser. Much better behaviour now.
2013-03-28 07:45:49 -04:00
Flow86
a4e7e74d5e
Merge pull request #666 from Flow86/patch-powerRequest
...
Fix bug in power distribution (Generic and Wooden Pipe)
2013-03-28 04:29:18 -07:00
Flow86
4a8f1654c5
Merge remote-tracking branch 'remotes/origin/patch-powerRequest' into patch-renderPipe
...
closes #666
2013-03-28 12:27:57 +01:00
Flow86
cf4ecc45fb
fix power pipes rendering
2013-03-28 12:16:34 +01:00
Flow86
673ccb6b42
fix render refinery
2013-03-28 12:08:53 +01:00
Flow86
bff16e6c96
fix rendering of liquids in pipes
2013-03-28 12:00:51 +01:00
Flow86
e01ea820a0
null pointer check in rendertank
2013-03-28 11:58:56 +01:00
TarzanBuzzyMan
254c671cec
Update BlockOilStill.java
...
Strip off unnecessary code after Krapht's Forge PR merge.
2013-03-28 23:19:19 +13:00
TarzanBuzzyMan
6642d4fac1
Update BlockOilFlowing.java
...
Strip off unnecessary code after Krapht's Forge PR merge.
2013-03-28 23:15:37 +13:00
Flow86
042f0a1ad8
Merge pull request #704 from Flow86/patch-renderTank
...
Patch render tank
2013-03-28 02:02:41 -07:00
Flow86
83e8e14028
Merge remote-tracking branch 'remotes/upstream/mc1.5' into patch-renderTank
2013-03-28 10:02:10 +01:00
Flow86
f355eec9a4
Merge pull request #684 from TarzanBuzzyMan/patch-3
...
Update oil to use 1.5 texturing
2013-03-28 02:00:55 -07:00
Flow86
4d92a9b918
fix RenderTank
2013-03-28 10:00:05 +01:00
Flow86
f9b6980993
fix commit by TarzanBuzzyMan
2013-03-28 09:56:12 +01:00
Flow86
25755d57bc
Merge remote-tracking branch 'remotes/patch-oil/patch-3' into patch-renderTank
2013-03-28 09:53:48 +01:00
