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

1837 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Florian Nücke
58dcea4f62 fixed log spam when ic2 is installed 2014-03-25 14:31:17 +01:00
Florian Nücke
3a9c6d2b14 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-03-25 13:21:55 +01:00
Florian Nücke
b725473574 fixed gregtech analyzer recipe (needed wildcard for sensor damage) v1.2.4 2014-03-25 13:21:23 +01:00
Florian Nücke
cc966a2028 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 
Conflicts:
	build.properties
 2014-03-24 22:56:20 +01:00
Florian Nücke
c25260d8eb bump version number 2014-03-24 22:55:47 +01:00
Florian Nücke
5025b6bfda Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/common/block/PowerConverter.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/PowerAcceptor.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/power/ThermalExpansion.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/power/UniversalElectricity.scala
 2014-03-24 22:38:10 +01:00
Florian Nücke
082e39207c Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/common/tileentity/traits/PowerAcceptor.scala
	src/main/scala/li/cil/oc/server/TickHandler.scala
 2014-03-24 22:33:18 +01:00
Florian Nücke
2d792aeb65 cleaned up power traits a bit more 2014-03-24 22:29:17 +01:00
Florian Nücke
231f78c674 added 'drop' signal that is triggered when a mouse button is released after a previous drag signal (and only then!), closes #173 
cleaned up power traits a little
 2014-03-24 20:57:11 +01:00
Florian Nücke
552bf5e3c2 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/common/tileentity/traits/PowerAcceptor.scala
	src/main/scala/li/cil/oc/server/TickHandler.scala
 2014-03-24 17:42:39 +01:00
Florian Nücke
75f661696f overscaling chars on screens a little (amount configurable) to (hopefully) suppress/reduce render glitches on less accurate graphics cards 
fixed potential NPE in analyzer
fixed minor derp in adapter
triggering ic2 events in tick handler to avoid recreating tile entity in invalidate in certain cases (RiM)
saving chunk coords in computer nbt for reliably loading them again even when moved (RiM or similar)
 2014-03-24 17:19:51 +01:00
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