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

1197 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
dc8a37014b Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-03-07 09:56:35 +01:00
Florian Nücke
fb15bfcf62 new wrapper to unbreak things again 2014-03-07 09:55:04 +01:00
Florian Nücke
c356341222 changed artifact naming for jenkins 2014-03-07 09:34:00 +01:00
Florian Nücke
d2b04bceff Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 
Conflicts:
	README.md
	build.gradle
	gradle/wrapper/gradle-wrapper.jar
	gradle/wrapper/gradle-wrapper.properties
	src/api/java/universalelectricity/api/CompatibilityModule.java
	src/api/java/universalelectricity/api/energy/IEnergyContainer.java
	src/api/java/universalelectricity/api/energy/IEnergyInterface.java
	src/api/java/universalelectricity/api/net/IConnectable.java
	src/main/java/li/cil/oc/client/TexturePreloader.scala
	src/main/java/li/cil/oc/common/block/Keyboard.scala
	src/main/java/universalelectricity/api/UniversalClass.java
	src/main/scala/li/cil/oc/CraftingHandler.scala
	src/main/scala/li/cil/oc/client/TexturePreloader.scala
	src/main/scala/li/cil/oc/client/Textures.scala
	src/main/scala/li/cil/oc/common/ConnectionHandler.scala
	src/main/scala/li/cil/oc/common/block/Keyboard.scala
	src/main/scala/li/cil/oc/common/block/KeyboardDeprecated.scala
	src/main/scala/li/cil/oc/common/launch/TransformerLoader.scala
	src/main/scala/li/cil/oc/common/tileentity/Hologram.scala
	src/main/scala/li/cil/oc/server/TickHandler.scala
	src/main/scala/li/cil/oc/util/mods/UniversalElectricity.scala
 2014-03-07 09:30:26 +01:00
Florian Nücke
d1ee3ef567 java goes to java 2014-03-07 09:23:06 +01:00
Florian Nücke
248d4da9ec updated readme regarding dev env/compiling 2014-03-07 08:00:50 +01:00
Florian Nücke
064a8520f9 fixed crash when using analyzer on hologram projector (and other sided environments returning returning null on some sides), closes #148; made the analyzer work on any side of the hologram projector 2014-03-07 07:50:24 +01:00
Florian Nücke
376d780042 sorted out libraries with gradle (without having to have them in the repo, even!). thanks bop! 2014-03-07 06:50:54 +01:00
Florian Nücke
97353c44ee going gradle 2014-03-06 21:35:36 +01:00
Florian Nücke
79ff3e1732 using same version number for mc1.7 as for 1.6 now, since they're feature identical after all (well, except for mod dependencies of course) 2014-03-06 19:02:22 +01:00
Florian Nücke
c7f133f406 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-03-06 17:57:36 +01:00
Florian Nücke
2429733d04 bump api version number; added private constructor to CreativeTab api class 2014-03-06 17:57:16 +01:00
Florian Nücke
f0fcc61c8a fixed for 1.7 2014-03-06 17:45:41 +01:00
Florian Nücke
6da691b022 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/common/Proxy.scala
 2014-03-06 17:43:42 +01:00
Florian Nücke
37911e04d9 make computer.energy() return math.huge (positive infinity) when power use is disabled (in config or ue missing); added api classes to access oc's blocks, items and creative tab 2014-03-06 17:42:28 +01:00
Florian Nücke
10f3ca8a3f Merge pull request #147 from cazzar/MC1.7 
Added gradle wrapper and dev+api artifacts.
 2014-03-06 15:40:02 +01:00
Cayde Dixon
3020fb74e7 Added gradle wrapper and dev+api artifacts. 2014-03-07 01:33:29 +11:00
Florian Nücke
88cecdfc7e Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-03-06 13:22:32 +01:00
Florian Nücke
5a07cb4748 fixed hologram projector connectivity check being purely visual, also only allow connection from below because cables going in from the side looks really stupid 2014-03-06 11:59:50 +01:00
Florian Nücke
1d598367bb wireless router now also injects received wireless messages into adjacent cc computers 2014-03-06 11:11:16 +01:00
Florian Nücke
954055b91e disabled the pseudo-port of UE in the mod to avoid potential conflicts/incompatibilities with UE for 1.7, will re-enable / upgrade as soon as UE is available for MC 1.7 2014-03-05 21:51:43 +01:00
Florian Nücke
166e191030 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-03-05 21:46:21 +01:00
Florian Nücke
01ff318383 added note that oc has to be BON'ed for dev-env use of the jars 2014-03-05 21:19:26 +01:00
Florian Nücke
65e7707df0 more local 2014-03-05 21:17:33 +01:00
Florian Nücke
7c068b7f62 fixed keyboard 'can stay' check 2014-03-05 19:29:57 +01:00
Florian Nücke
5609bb4c93 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/common/tileentity/WirelessRouter.scala
	src/main/scala/li/cil/oc/server/driver/CompoundBlockDriver.scala
 2014-03-05 19:29:17 +01:00
Florian Nücke
2dac42303e added api to allow setting wireless router's signal strength; fixed lua.lua's result printing not wrapping 2014-03-05 19:20:42 +01:00
Florian Nücke
7b5e234737 formatting 2014-03-05 17:46:01 +01:00
Florian Nücke
efebc5964e ignore empty inventory names 2014-03-05 17:39:09 +01:00
Florian Nücke
27ed5e7ee1 adjustment for mc 1.7 2014-03-05 17:29:54 +01:00
Florian Nücke
fc6e47e4e9 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-03-05 17:29:28 +01:00
Florian Nücke
362e79f779 don't show our own stuff via the adapter 2014-03-05 15:50:40 +01:00
Florian Nücke
a52e8c6744 folders. i remembered to adjust them. 2014-03-05 15:24:58 +01:00
Florian Nücke
8930c6a39f Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-03-05 15:21:58 +01:00
Florian Nücke
9c5492f527 fixed logic for power check in wireless router 2014-03-05 15:21:06 +01:00
Florian Nücke
d55027e4ee Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/Blocks.scala
	src/main/scala/li/cil/oc/common/Proxy.scala
	src/main/scala/li/cil/oc/common/tileentity/Hub.scala
	src/main/scala/li/cil/oc/common/tileentity/PassiveNode.scala
	src/main/scala/li/cil/oc/common/tileentity/Router.scala
	src/main/scala/li/cil/oc/server/component/NetworkCard.scala
	src/main/scala/li/cil/oc/server/component/UpgradeCrafting.scala
	src/main/scala/li/cil/oc/server/network/Network.scala
	src/main/scala/li/cil/oc/util/WirelessNetwork.scala
 2014-03-05 15:19:22 +01:00
Florian Nücke
e416ad34d0 well that's lovely, why didn't that error before... 2014-03-05 14:47:21 +01:00
Florian Nücke
1f02180177 textures, localization and recipe for wireless router and actually connecting it to the wireless network (how weird does that sound?); fixed file handles not being properly closed in unbuffered mode 2014-03-05 14:36:22 +01:00
Florian Nücke
75084c2ccf abstract wireless network logic a little and started work on wireless router/switch 2014-03-05 13:17:11 +01:00
Florian Nücke
6c1e15e1bd some cleanup of non-updating node block initialization; renamed router to switch; improved networking, packets now have a ttl, meaning they can only be bounced by switches up to 5 times, avoids stack overflows. they also store the origins address now, so packets will always give the real sender's address now, not the address of the last switch they passed through. switches also have an internal queue of size 20 now and will only forward one packet per 5 ticks, so a) latency is now a thing, b) packet drops are also a thing. 2014-03-05 06:22:03 +01:00
Florian Nücke
5f7360ff82 fixed servers in server racks not connect to any side not getting power 2014-03-05 05:00:00 +01:00
Florian Nücke
c00233023b cleaned up the robot implementation, removing some ugly cross-references, inheritance and dependencies, will require to be rebooted if they already loaded the robot module 2014-03-05 00:44:55 +01:00
Florian Nücke
28a12d08b6 added support for immibis microblocks. once you know what you're doing it's ridiculously simple. 2014-03-04 21:10:12 +01:00
Florian Nücke
41f4738115 added note that it's ok to return null from callbacks to callback annotation jdoc 2014-03-04 15:09:55 +01:00
Florian Nücke
ee1bcc72a3 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/java/li/cil/oc/common/asm/SimpleComponentTickHandler.java
	src/main/java/li/cil/oc/server/TickHandler.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/tileentity/Computer.scala
	src/main/scala/li/cil/oc/common/tileentity/Rack.scala
	src/main/scala/li/cil/oc/server/PacketHandler.scala
	src/main/scala/li/cil/oc/server/component/machine/Architecture.scala
	src/main/scala/li/cil/oc/server/component/machine/ExecutionResult.scala
	src/main/scala/li/cil/oc/server/component/machine/Machine.scala
	src/main/scala/li/cil/oc/server/component/robot/Robot.scala
	src/main/scala/li/cil/oc/server/network/Network.scala
 2014-03-04 13:44:37 +01:00
Florian Nücke
b77585b66a Merge branch 'master' of https://github.com/MightyPirates/OpenComputers 2014-03-04 13:32:25 +01:00
Florian Nücke
600b3b73f1 cleaned up a little more; renamed the redirection methods used by the class transformer to make naming collisions even less likely 2014-03-04 13:32:05 +01:00
Florian Nücke
2501e816f1 Merge pull request #146 from Wobbo/master 
Better variable expansion in besh
 2014-03-03 21:41:12 +01:00
Wobbo
3facca0835 Better variable expansion in besh 2014-03-03 21:34:43 +01:00
Florian Nücke
d65bd29886 some more fixes and adjustments; cleanup 2014-03-03 20:23:28 +01:00