AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-26 14:35:04 -04:00
Code Issues Packages Projects Releases Wiki Activity
1,656 Commits 29 Branches 143 Tags
Commit Graph

1656 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
94d4ef7ef1 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 
Conflicts:
	build.properties
	src/main/scala/li/cil/oc/client/PacketSender.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/RedstoneAware.scala
	src/main/scala/li/cil/oc/util/ItemCosts.scala
 2014-04-04 21:00:40 +02:00
Florian Nücke
920c7d45ba Merge branch 'master' of github.com:MightyPirates/OpenComputers 2014-04-04 20:42:11 +02:00
Florian Nücke
40de0cc312 Fixed changing bundled redstone output not causing a block update. 
Bumped version number.
 2014-04-04 20:41:48 +02:00
Florian Nücke
f384eadeca Relaxed throttling of clipboard pasting a little and added audio feedback when pasting while on cooldown. 2014-04-04 20:30:19 +02:00
Florian Nücke
1ae3eb4c57 Replaced cobweb in internet card recipe, enchanting shears with silktouch was a little too silly after all. 2014-04-04 20:17:18 +02:00
Florian Nücke
530603a012 Merge pull request #196 from Sodiet/patch-1 
Update ru_RU.lang
 2014-04-03 16:52:28 +02:00
Rostislav
1b65182d29 Update ru_RU.lang 
Translation updated, corrected and improved.
---
Перевод обновлен, уточнен и улучшен.
 2014-04-03 19:12:15 +06:00
Florian Nücke
47ba428c59 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/server/component/robot/Player.scala
 2014-04-03 12:01:52 +02:00
Florian Nücke
fca62946bf Merge pull request #195 from infinikiller64/patch-1 
Added :gsub("\\\n","\\n") to string serialization
v1.2.5 		2014-04-03 11:52:35 +02:00
Florian Nücke
523b4c12d3 Suppressing use of the leash by robots, because that's horribly borked (due to the fake player entity only being server side and not being saved). 
Fixed robot interaction with entities when Battlegear 2 is present (e.g. shears on sheep).
 2014-04-03 11:51:16 +02:00
PixelToast
90648a90c1 Added :gsub("\\\n","\\n") to string serialization 
this is because string.format("q","\n")=="\\\n"
which can break some database programs
 2014-04-02 18:45:13 -04:00
Florian Nücke
dc92987fc9 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-04-02 20:15:24 +02:00
Florian Nücke
a715a21226 Made blank screens not draw power. 
This actually reduces the energy cost for screens, but realizing that computers and robots don't actually draw as fast as the config suggests (because they idle most of the time) this is for the better I think.
 2014-04-02 20:15:04 +02:00
Florian Nücke
698638d0ce Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/common/asm/ClassTransformer.scala
 2014-04-02 12:55:56 +02:00
Florian Nücke
1acdd5f8ae Adjusted package search path to search in working directory last. This is similar to the change that was made a while back to the PATH env variable. It's also like it is in standard Lua. Should mostly avoid issues like #191. 2014-04-02 12:43:31 +02:00
Florian Nücke
3217c721c3 fixed a render glitch on cables probably noone would ever have noticed (slightly stretched on one face) 2014-04-01 20:36:27 +02:00
Florian Nücke
cac4cbd8f4 fixed invalid chars not being rendered as '?' but not at all 2014-04-01 20:14:28 +02:00
Florian Nücke
ac71317340 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-03-30 23:30:23 +02:00
Florian Nücke
5cdb8a7e74 fixed ls dir color on tier 2 screens after the pack/unpack stabilization 
fixed path resolver in shell for relative paths
 2014-03-30 23:30:05 +02:00
Florian Nücke
d9a94049d7 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/common/block/Delegator.scala
 2014-03-30 23:00:29 +02:00
Florian Nücke
f8194510b8 updated waila 2014-03-30 22:56:23 +02:00
Florian Nücke
5dd0d6799b Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-03-30 21:42:43 +02:00
Florian Nücke
38533cdc4a fixed instability in table packing/unpacking as suggested in #184 2014-03-30 21:40:51 +02:00
Florian Nücke
0c622a021c Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/common/Proxy.scala
	src/main/scala/li/cil/oc/common/tileentity/Router.scala
	src/main/scala/li/cil/oc/util/mods/ComputerCraft.scala
 2014-03-30 21:24:23 +02:00
Florian Nücke
fc0150b9cc added cc 1.5 api back and added backwards compatibility so we now support cc 1.5 and 1.6 
applying max packet size for packets sent through a switch or access point from cc
access point returns true for isWireless in the cc api now
 2014-03-30 21:08:46 +02:00
Florian Nücke
3605970ce1 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 
Conflicts:
	build.properties
 2014-03-30 18:01:38 +02:00
Florian Nücke
43acfd083b bumped version number 2014-03-30 18:01:05 +02:00
Florian Nücke
b0fd30fd2e Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/server/component/robot/Player.scala
 2014-03-30 18:00:33 +02:00
Florian Nücke
0adfbe42c6 working around BattleGear 2's access transformer screwing with the EntityPlayer class in a way that breaks robots 2014-03-30 17:54:51 +02:00
Florian Nücke
e03d7ce2ff added getter for robot's name to the robot api 
larger screens render further than smaller screens now (the max render distance setting applies to 1x1 screens)
 2014-03-30 17:00:46 +02:00
Florian Nücke
26df6585cd Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/Items.scala
	src/main/scala/li/cil/oc/common/ConnectionHandler.scala
	src/main/scala/li/cil/oc/common/Proxy.scala
	src/main/scala/li/cil/oc/common/block/Cable.scala
	src/main/scala/li/cil/oc/common/block/Delegator.scala
	src/main/scala/li/cil/oc/common/block/Screen.scala
	src/main/scala/li/cil/oc/common/item/AbstractBusCard.scala
	src/main/scala/li/cil/oc/common/tileentity/Router.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/BundledRedstoneAware.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/RedstoneAware.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/power/IndustrialCraft2.scala
	src/main/scala/li/cil/oc/server/component/robot/Player.scala
	src/main/scala/li/cil/oc/server/network/Network.scala
	src/main/scala/li/cil/oc/util/mods/IndustrialCraft2.scala
 2014-03-29 21:28:09 +01:00
Florian Nücke
3085b961b8 added version specific mod presence checks 2014-03-29 21:09:37 +01:00
Florian Nücke
9065acf946 some more texture reworking and tweaks (brightness adjustments and such) 2014-03-29 19:29:11 +01:00
Florian Nücke
a2f1e1d3eb Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-03-29 17:00:21 +01:00
Florian Nücke
5350d8a626 fixed charger not recognizing already present redstone signals when placed 2014-03-29 16:59:52 +01:00
Florian Nücke
5446f66f59 some checks to avoid class loader trying to load cc api when it's not present 2014-03-29 16:51:41 +01:00
Florian Nücke
61c3f380f6 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-03-29 15:57:07 +01:00
Florian Nücke
93d1fb2b71 classes *and* sources in api jar, since IDEs sometimes seem to not recognize the sources 2014-03-29 15:56:45 +01:00
Florian Nücke
03a130e509 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/api/java/dan200/computercraft/api/turtle/ITurtleUpgrade.java
	src/main/scala/li/cil/oc/common/Proxy.scala
 2014-03-29 15:43:53 +01:00
Florian Nücke
a6d46afecb updated CC API to 1.6 2014-03-29 15:37:08 +01:00
Florian Nücke
37bda977f0 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/java/li/cil/oc/common/asm/SimpleComponentTickHandler.java
	src/main/scala/li/cil/oc/common/tileentity/traits/Hub.scala
	src/main/scala/li/cil/oc/server/TickHandler.scala
 2014-03-29 13:03:55 +01:00
Florian Nücke
bea3eff754 fixes potential ConcurrentModificationException in tick handler 2014-03-29 13:00:59 +01:00
Florian Nücke
d678024bd6 fixed access points not directly relaying wireless packets and the way hub relay delays work 2014-03-29 01:14:09 +01:00
Florian Nücke
bf2eccebfb Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/client/Textures.scala
	src/main/scala/li/cil/oc/client/renderer/tileentity/PowerDistributorRenderer.scala
	src/main/scala/li/cil/oc/common/block/Case.scala
	src/main/scala/li/cil/oc/common/block/Charger.scala
	src/main/scala/li/cil/oc/common/block/PowerDistributor.scala
 2014-03-28 23:47:59 +01:00
Florian Nücke
2c54b6ddd7 fixed nullpointer in serialization of broadcast packets in switch/access point; reworked a couple of textures 2014-03-28 23:29:58 +01:00
Florian Nücke
b34f43c386 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-03-27 22:31:26 +01:00
Florian Nücke
e7d6666b68 fixed the fix -.- 2014-03-27 22:31:12 +01:00
Florian Nücke
ef2e6ed290 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/common/tileentity/traits/power/BuildCraft.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/power/IndustrialCraft2.scala
 2014-03-27 19:59:51 +01:00
Florian Nücke
b1a41fffc8 avoid potential crashes in power logic 2014-03-27 19:57:48 +01:00
Florian Nücke
56d76c5fb9 fix for the render bug in mc 1.7.2 that flips textures horizontally on +x and -z, closes #114 2014-03-26 19:14:49 +01:00