Commit Graph
11 Commits
Author SHA1 Message Date
Tom Elfring c9dc4c0ac0 Merge remote-tracking branch 'upstream/1.11' into 1.12 2017-08-04 18:49:20 +02:00
aidancbrady 5bd67b37b2 Fixed IC2 integration 2017-07-31 19:41:24 -07:00
aidancbrady 8ed83b0e4f Merge branch '1.11' into 1.12
* 1.11:
  Fixed the horrible transmitter issue (spec: DynamicNetwork:215-218) Also, fixed client render update delay
  move zh_cn lang file back to thr correct place
  Update entity names
  Another cleanup
  Fix dev environment after adding SD compat
  Kill off some unused code
  Updated minor compat

Conflicts:
	build.gradle
2017-07-31 18:40:01 -07:00
aidancbrady 6ef08e90f1 Another cleanup 2017-07-27 09:33:09 -07:00
aidancbrady 48c748e55e Kill off some unused code 2017-07-26 14:04:26 -07:00
Tom Elfring 69e163abd9 Merge remote-tracking branch 'upstream/1.11' into 1.12_firstpass 2017-07-26 19:38:35 +02:00
Richard Carter a9b023a6b2 acceptEnergy/pullEnergy: return 0 if machine is full or empty
Prior to this change, the machines always updated their energy, which
involved a side check and a chunk markDirty; even if the machine is
receiving or giving 0 energy.
Right upfront, check if the machine needs no energy or has none to give,
and if so return 0.
I observed greatly increased server tick performance after this change.
2017-07-23 20:14:34 -04:00
Richard Carter 0c0411979d Add sideIsOutput and sideIsConsumer methods
getOutputtingSides and getConsumingSides both have to construct an
EnumSet, but most usages only immediately call contains() on the EnumSet
and then discard it. Improve performance by adding a method that can
test a side and return a boolean, avoiding the EnumSet creation.
2017-07-23 20:14:34 -04:00
Tom Elfring e9957ad895 Make redstoneflux an optional dependency 2017-07-23 13:59:18 +02:00
Tom Elfring 47d1640459 Fix integer overflows 2017-06-03 13:27:15 +02:00
aidancbrady 808f0cdf8a More refactoring, gave Rotary Condensentrator and Electrolytic Separator sound effects. Need to fix bugs 2017-04-27 22:51:44 -04:00