AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-17 11:15:12 -04:00
Code Issues Packages Projects Releases Wiki Activity
3,459 Commits 29 Branches 143 Tags
Commit Graph

3459 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
ac40670c4a Merge branch 'patch-1' of https://github.com/jecowa/OpenComputers 2014-08-26 19:09:11 +02:00
Florian Nücke
a7c410a4ee Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 
Conflicts:
	src/main/scala/li/cil/oc/client/PacketHandler.scala
	src/main/scala/li/cil/oc/common/multipart/CablePart.scala
	src/main/scala/li/cil/oc/common/multipart/MultiPart.scala
 2014-08-26 18:38:14 +02:00
Florian Nücke
637fdc3c72 Merge branch 'master' of github.com:MightyPirates/OpenComputers 2014-08-26 18:29:41 +02:00
Florian Nücke
fe7e743f55 Made cables dyeable and made them not connect when of different colors (except for light gray, the default color, which connects to all other colors). Closes #517. 2014-08-26 18:29:26 +02:00
Florian "Sangar" Nücke
d8076fdd0a Merge pull request #516 from ViKaleidoscope/patch-1 
Update zh_CN.lang
 2014-08-26 16:04:18 +02:00
Princess
197f084b09 Update zh_CN.lang 2014-08-26 17:46:11 +08:00
jecowa
bafed0777b Update robot.names 2014-08-26 02:37:03 -05:00
Florian Nücke
9d335b4711 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 
Conflicts:
	src/main/scala/li/cil/oc/common/tileentity/traits/power/IndustrialCraft2Classic.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/power/IndustrialCraft2Experimental.scala
	src/main/scala/li/cil/oc/util/LuaStateFactory.scala
 2014-08-25 22:10:22 +02:00
Florian Nücke
017660bba6 Merge branch 'OC1.3-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-08-25 22:05:04 +02:00
Florian Nücke
cc9c38c16d Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers 2014-08-25 22:04:27 +02:00
Florian Nücke
bbca2ee75c Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 2014-08-25 22:04:01 +02:00
Florian Nücke
adbab1125d Fixed memory leaks in the Lua sandbox when creating proxies and when creating coroutines. Closes #479. 2014-08-25 22:03:38 +02:00
Florian Nücke
d3d6fddff1 Back to the land of ifs instead of trying all libs to make sure that's not what's causing rare native lib related issues. 2014-08-25 20:32:18 +02:00
Florian Nücke
0787f56f72 -.- 2014-08-25 20:04:46 +02:00
Florian Nücke
c32fcc7c22 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 
Conflicts:
	src/main/scala/li/cil/oc/common/tileentity/traits/power/IndustrialCraft2Classic.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/power/IndustrialCraft2Experimental.scala
 2014-08-25 19:59:33 +02:00
Florian Nücke
d9aa7f5bd1 Potential fix for IC2 issues. 2014-08-25 19:55:07 +02:00
Florian Nücke
b8f38e0e52 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 
Conflicts:
	src/main/scala/li/cil/oc/client/renderer/font/DynamicFontRenderer.scala
	src/main/scala/li/cil/oc/client/renderer/font/FontParserUnifont.java
 2014-08-24 20:49:37 +02:00
Florian Nücke
ca9d28dfd6 Documented IGlyphProvider and cleaned up settings a little, making it easier to add additional glyph providers in the future. 
Also moved debug related stuff from computer.debug into top level category debug in settings, merged some other stuff into that.
 2014-08-24 20:44:35 +02:00
Florian Nücke
d25a61176b Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 
Conflicts:
	src/main/scala/li/cil/oc/common/block/Delegator.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/power/BuildCraft.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/power/Factorization.scala
 2014-08-24 13:06:31 +02:00
Florian Nücke
44f2e7ab1c Handling missing external save data more gracefully. 2014-08-24 13:03:44 +02:00
Florian Nücke
32af871971 Made all blocks 'harvestable' bare handed. 2014-08-24 12:30:12 +02:00
Florian Nücke
6ba799587d Merge branch 'OC1.3-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-08-24 12:28:04 +02:00
Florian Nücke
b3c13f771d Fixed graphical glitch caused by floppy item renderer when it was the last before rendering armor slots. 2014-08-24 12:27:08 +02:00
Florian Nücke
693d0646e7 Merge branch 'OC1.3-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-08-24 12:18:17 +02:00
Florian Nücke
fe46436047 Fixes potential server crash. 2014-08-24 12:17:53 +02:00
Florian Nücke
dbc7ad14bc Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 
Conflicts:
	src/main/scala/li/cil/oc/client/PacketHandler.scala
	src/main/scala/li/cil/oc/common/PacketBuilder.scala
 2014-08-23 23:35:28 +02:00
Florian Nücke
7e67db13b1 Externalized saved data for holograms. 2014-08-23 23:26:38 +02:00
Florian Nücke
08e203a36f Externalized saved tmpfs contents. 2014-08-23 22:46:19 +02:00
Florian Nücke
a36a0b525c Accumulating screen updates per tick and sending them as a batch packet, reducing overall net traffic quite a bit due to the reduced overhead (target info only has to be sent once). 
Also compressing the multi-packet, since the data is usually written in the worker threads the additional CPU overhead is negligible.
Doing some basic testing, the potential danger of packets getting too big seems irrelevant.
Some simple testing shows bandwidth reduction down to ~50% when spamming random simple `set()`s, and even down to ~15% for well compressible updates (`while true do print(string.rep(os.date(), 4)) end` for example).
 2014-08-23 22:26:03 +02:00
Florian Nücke
6b6c968a87 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-08-22 23:48:52 +02:00
Florian Nücke
9f92698254 Added configurable keybinds for edit and cleaned up a a little. 2014-08-22 23:47:49 +02:00
Florian Nücke
4c7c3c4399 Merge branch 'WazWaz' of https://github.com/WazWaz/OpenComputers 2014-08-22 20:24:40 +02:00
Florian Nücke
9985a12ba5 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 
Conflicts:
	src/main/scala/li/cil/oc/server/component/Keyboard.scala
	src/main/scala/li/cil/oc/server/driver/CompoundBlockEnvironment.scala
 2014-08-22 15:05:15 +02:00
Florian Nücke
6769e72efd Improved adapter behavior some, trying to differentiate compound driver environments to avoid re-using saved data where inappropriate. Should close #510. 
Fixed potential magical NPE in Keyboard (seemed to only happen when unloading a world by leaving the game).
 2014-08-22 14:56:06 +02:00
Florian Nücke
53d385ca19 Properly converting loot and os floppies to plain floppies when wiping them (shift-rightclick) so they stack. 2014-08-21 23:40:32 +02:00
Florian Nücke
12558effe2 Merge branch 'OC1.3-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-08-21 07:35:38 +02:00
Florian Nücke
333f0d7c11 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers 2014-08-21 07:35:28 +02:00
Florian Nücke
6aa0345d5d Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 
Conflicts:
	src/main/scala/li/cil/oc/common/tileentity/traits/Environment.scala
 2014-08-21 07:35:09 +02:00
Florian Nücke
347c023205 Fixed a derp in the fix for the broken fix for the thing. 2014-08-21 07:34:22 +02:00
Florian Nücke
dabf889ac2 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-08-21 01:50:33 +02:00
Florian Nücke
51a88cee79 Merge branch 'OC1.3-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-08-21 01:49:20 +02:00
Florian Nücke
bc00fbb1cb Merge branch 'master' of github.com:MightyPirates/OpenComputers 2014-08-21 01:47:44 +02:00
Florian Nücke
4faea3b9b3 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 
Conflicts:
	src/main/scala/li/cil/oc/common/tileentity/traits/Environment.scala
 2014-08-21 01:45:09 +02:00
Florian Nücke
79cd490543 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers 2014-08-21 01:44:12 +02:00
Florian Nücke
5e20f38009 Fixed for for potential race condition fixing it the wrong way around (markChanged in envs now properly handles async calls, avoiding potentially triggering chunk loads when it shouldn't). 2014-08-21 01:43:27 +02:00
Florian Nücke
3812128b8c Updated natives, using libs with debug symbols for dev branch now. 2014-08-21 01:32:26 +02:00
Florian "Sangar" Nücke
87476dca87 Merge pull request #506 from Atuto/master 
Update robot.names
 2014-08-20 20:23:16 +02:00
Atuto
f3ee1454af Update robot.names 
Added Callister Raynes.  http://eureka.wikia.com/wiki/Callister_Raynes
 2014-08-19 19:11:59 -05:00
Atuto
7724844b5d Update robot.names 
Added Deputy ANDY from Eureka. http://eureka.wikia.com/wiki/ANDY
 2014-08-19 19:02:59 -05:00
Florian Nücke
e4e161552d Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 
Conflicts:
	src/main/scala/li/cil/oc/util/LuaStateFactory.scala
 2014-08-19 21:57:04 +02:00