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,345 Commits 29 Branches 143 Tags
Commit Graph

1345 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
f29eed393e Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-03-23 12:15:07 +01:00
Florian Nücke
454f3e9b66 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/client/PacketSender.scala
	src/main/scala/li/cil/oc/client/renderer/tileentity/CableRenderer.scala
	src/main/scala/li/cil/oc/client/renderer/tileentity/RobotRenderer.scala
	src/main/scala/li/cil/oc/common/block/Capacitor.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/Delegate.scala
	src/main/scala/li/cil/oc/common/block/Delegator.scala
	src/main/scala/li/cil/oc/common/block/DiskDrive.scala
	src/main/scala/li/cil/oc/common/block/Hologram.scala
	src/main/scala/li/cil/oc/common/block/Keyboard.scala
	src/main/scala/li/cil/oc/common/block/RedstoneAware.scala
	src/main/scala/li/cil/oc/common/block/RobotProxy.scala
	src/main/scala/li/cil/oc/common/block/Screen.scala
	src/main/scala/li/cil/oc/common/block/WirelessRouter.scala
	src/main/scala/li/cil/oc/common/tileentity/Adapter.scala
	src/main/scala/li/cil/oc/common/tileentity/Cable.scala
	src/main/scala/li/cil/oc/common/tileentity/Case.scala
	src/main/scala/li/cil/oc/common/tileentity/Charger.scala
	src/main/scala/li/cil/oc/common/tileentity/PowerConverter.scala
	src/main/scala/li/cil/oc/common/tileentity/Redstone.scala
	src/main/scala/li/cil/oc/common/tileentity/WirelessRouter.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/Inventory.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/PowerAcceptor.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/RedstoneAware.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/TileEntity.scala
	src/main/scala/li/cil/oc/server/PacketHandler.scala
	src/main/scala/li/cil/oc/server/component/Redstone.scala
 2014-03-23 12:14:56 +01:00
Florian Nücke
4c564d72d9 avoid composite file systems have space total < space used v1.2.3 2014-03-23 12:14:07 +01:00
Florian Nücke
0f5ce02e97 Merge branch 'master' of github.com:MightyPirates/OpenComputers 2014-03-23 11:43:18 +01:00
Florian Nücke
20f7f97846 keeping updating envs managed by adapter in list and iterating that instead of all of them 2014-03-23 11:43:07 +01:00
Florian Nücke
a042b71a15 fixed robots always dropping items forward into the world (even for dropUp and dropDown) 2014-03-23 11:06:52 +01:00
Florian Nücke
ceab755f72 some more cleanup 2014-03-23 10:13:41 +01:00
Florian Nücke
57b84e19d0 added check for cc presence in access point (might have potentially crashed i think) 2014-03-23 00:58:28 +01:00
Florian Nücke
f8136def10 some more minor cleanup and refactoring 2014-03-23 00:52:53 +01:00
Florian Nücke
db6ef15947 minor internal refactoring (moving tile entity traits to extra package); robots don't get scared and freeze when being watched anymore (if waila is installed); removed the general pause after sync calls again, too broad, e.g. slows down robots massively due to pauses after detect() and such; added pause to redstone component instead; fixed robot name tag always rendering behind robot tool (even when it should be in front of it) 2014-03-23 00:43:05 +01:00
Florian Nücke
2eb28c8562 Merge pull request #169 from kebbanalex/patch-1 
Added more names to robot.names
 2014-03-23 00:09:59 +01:00
kebbanalex
4355598d4c Added more names to robot.names 2014-03-22 22:55:48 +01:00
Florian Nücke
d34bd491bb Merge pull request #168 from Vexatos/patch-3 
An important one.
 2014-03-22 16:38:36 +01:00
Vexatos
686e8db6b7 An important one. 
If you did not know, search for it, you'll maybe find out.
 2014-03-22 16:27:07 +01:00
Florian Nücke
026d87fa4f more waila support for a couple of blocks 2014-03-21 14:48:47 +01:00
Florian Nücke
aa81f5ad46 make analyzer show sided address and signal strength on access point; adding waila support 2014-03-21 13:42:08 +01:00
Florian Nücke
6c3a883624 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/server/component/robot/Player.scala
	src/main/scala/li/cil/oc/server/component/robot/Robot.scala
 2014-03-20 22:23:14 +01:00
Florian Nücke
234651592e made hardmode.recipes include default.recipes to avoid missing recipes when players comment out the default recipes in the user.recipes; additionally using block break event to check if robots may break blocks (either by "clicking" them or by moving into them), making it compatible with WorldGuard, e.g. 2014-03-20 11:18:14 +01:00
Florian Nücke
2366e8c5fb Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/common/tileentity/RedstoneAware.scala
 2014-03-19 07:54:41 +01:00
Florian Nücke
9778a72fc9 added setting for sync call pause 2014-03-19 07:53:57 +01:00
Florian Nücke
8437af06d5 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/common/tileentity/BundledRedstoneAware.scala
	src/main/scala/li/cil/oc/common/tileentity/RedstoneAware.scala
 2014-03-19 07:53:38 +01:00
Florian Nücke
4e7bc78836 cleaned up redstone logic a bit and enforcing a short delay after synchronized calls to avoid tick times for computers going through the roof due to spammy synchronized calls (e.g. redstone.setOutput every frame). this is more of a workaround, i'll have to see if i can find a cleaner solution for this. 2014-03-18 19:00:57 +01:00
Florian Nücke
c8fa07c2b9 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-03-18 14:06:19 +01:00
Florian Nücke
3b5bb9487b undid the Arguments.checkInteger change since it can break things (and did!), checking for actual int byte mask in hologram manually now 2014-03-18 14:05:58 +01:00
Florian Nücke
61a2ceaf3d Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-03-18 09:32:56 +01:00
Florian Nücke
296daa7e1c fixed Arguments.checkInt for 0x80000000 2014-03-18 09:32:12 +01:00
Florian Nücke
4d79646ed6 adjusted version specific parts in readme 2014-03-18 07:00:28 +01:00
Florian Nücke
9c9b9d3c02 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-03-18 06:56:58 +01:00
Florian Nücke
bd780583c7 more info on using api/deobf jar as dependency 2014-03-18 06:56:06 +01:00
Florian Nücke
e9adf89123 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-03-17 18:57:08 +01:00
Florian Nücke
1c049fe9bd plain sources in api jar 2014-03-17 18:56:41 +01:00
Florian Nücke
e1ab023fa0 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-03-17 17:40:50 +01:00
Florian Nücke
cba29b2e9a make computer state save system more compatible with non-standard use of save/load 2014-03-17 16:57:32 +01:00
Florian Nücke
5319d5f0ea Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-03-17 13:31:53 +01:00
Florian Nücke
2e92183abb fixed config not being created (only updated) 2014-03-17 13:31:26 +01:00
Florian Nücke
3d5901843d Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-03-17 12:12:02 +01:00
Florian Nücke
a65ccb7407 fixed save system for computer states. god that was stupid. warning: computers saved in build 266-273 won't be restored properly. 2014-03-17 12:11:38 +01:00
Florian Nücke
708f751fb6 added missing side check when stopping running sound for computers 2014-03-17 11:36:27 +01:00
Florian Nücke
3442dbed18 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-03-17 10:42:23 +01:00
Florian Nücke
018da854ed making deobf jar default jar in maven repo; added javadoc jar to maven 2014-03-17 10:42:00 +01:00
Florian Nücke
af543848bd Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-03-17 10:20:59 +01:00
Florian Nücke
9c1cc85cb8 formatting in fingerprint warning string 2014-03-17 09:56:33 +01:00
Florian Nücke
678424ee09 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-03-17 09:03:39 +01:00
Florian Nücke
daba8544fb fixed returning java maps as tables from callbacks 2014-03-17 09:02:43 +01:00
Florian Nücke
e7f4a32d95 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/java/li/cil/oc/api/network/SidedEnvironment.java
	src/main/scala/li/cil/oc/OpenComputers.scala
	src/main/scala/li/cil/oc/common/ConnectionHandler.scala
	src/main/scala/li/cil/oc/common/SaveHandler.scala
 2014-03-16 17:54:28 +01:00
Florian Nücke
1ac63d205a some jdoc fixes 2014-03-16 17:17:23 +01:00
Florian Nücke
8c1571c1d0 added javadoc jar generation; added fingerprint generation/check and jar signing 2014-03-16 17:05:52 +01:00
Florian Nücke
70755c8528 better clean up of no longer valid computer state saves by handling saving in the chunk's save callback (instead of the world's) 2014-03-16 10:31:45 +01:00
Florian Nücke
a7701969d5 updated luaj to cvs snapshot version, to get official fix for string matcher 2014-03-16 10:07:17 +01:00
Florian Nücke
9f638c0984 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-03-16 09:20:35 +01:00